--- configure	Sun Aug 25 18:11:30 2002
+++ configure	Sun Aug 25 18:13:29 2002
@@ -7,18 +7,18 @@
 #####  ===>  ALL OF THESE WILL BE RELATIVE TO PREFIX, IF SUPPLIED.
 
 #  Destination for the scripts (make_root_fs, check_root_fs, etc)
-$scripts_dest   =  "sbin";
+$scripts_dest   =  "usr/sbin";
 
 #  Destination for the immutable library files (original contents of
 #  Replacements/ and extras/).
-$lib_dest       =  "lib/yard";
+$lib_dest       =  "usr/lib/yard";
 
 #  Destination for the configuration and editable files.  This includes
 #  Config.pl and Bootdisk_Contents, and everything under Replacements
 $config_dest = "etc/yard";
 
 #  Destination for documentation files (in Doc subdirectory)
-$doc_dest	=  "usr/doc/yard-${yard_version}";
+$doc_dest	=  "usr/share/doc/yard-${yard_version}";
 
 
 ##############################################################################

--- Makefile.in	Sun Jun 17 19:39:47 2001
+++ Makefile.in	Sun Aug 25 19:20:07 2002
@@ -44,34 +44,33 @@
 	cd doc ; make man
 
 install: 
-	$(INSTALL) -d $(scripts_dest) $(lib_dest) $(config_dest) $(doc_dest)
-	cd scripts ; $(INSTALL) -o root -m 655 $(SCRIPTS) $(scripts_dest)
+	$(INSTALL) -d $(DESTDIR)/$(scripts_dest) $(DESTDIR)/$(lib_dest) $(DESTDIR)/$(config_dest) $(DESTDIR)/$(doc_dest)
+	cd scripts ; $(INSTALL) -o root -m 655 $(SCRIPTS) $(DESTDIR)/$(scripts_dest)
 	cd extras ; make install
 	cd doc    ; make install
-	$(INSTALL_DATA) -o root yard_utils.pl yardconfig.pm            $(lib_dest)
+	$(INSTALL_DATA) -o root yard_utils.pl yardconfig.pm            $(DESTDIR)/$(lib_dest)
 	$(INSTALL_DATA) -o root Bootdisk_Contents \
-		Bootdisk_Contents.{minimal,sample,Pilotbackup}         $(lib_dest)
-	$(INSTALL_DATA) -o root Config.pl                              $(lib_dest)
+		Bootdisk_Contents.{minimal,sample,Pilotbackup}         $(DESTDIR)/$(lib_dest)
+	$(INSTALL_DATA) -o root Config.pl                              $(DESTDIR)/$(lib_dest)
 	#   Install create_replacements as a lib script.
 	#   We need access to it but it shouldn't be visible to the user.
-	cd scripts; $(INSTALL) -o root -m 655 create_replacements      $(lib_dest)
-	$(CP) --parents `cat Replacements/ALL_REPLACEMENT_FILES`       $(lib_dest)
+	cd scripts; $(INSTALL) -o root -m 655 create_replacements      $(DESTDIR)/$(lib_dest)
+	$(CP) --parents `cat Replacements/ALL_REPLACEMENT_FILES`       $(DESTDIR)/$(lib_dest)
 	@echo Done.  You should now type \"make customize\" to create
 	@echo customizable files, if you don\'t already have them.
 
 customize:
-	$(INSTALL) -d $(config_dest)/Replacements/etc
-	$(INSTALL) -d $(config_dest)/Replacements/root
+	$(INSTALL) -d $(DESTDIR)/$(config_dest)/Replacements/etc
+	$(INSTALL) -d $(DESTDIR)/$(config_dest)/Replacements/root
 	#    create_replacements puts files into config_dest
-	$(lib_dest)/create_replacements
 	@echo !
 	@echo !    Now installing configuration files, which may already exist.
 	@echo !    Answer \'no\' if you want to preserve your
 	@echo !    existing configuration.
 	@echo !
-	$(CP) -ir $(lib_dest)/Replacements      $(config_dest)
-	$(CP) -ir $(lib_dest)/Bootdisk_Contents $(config_dest)
-	$(CP) -ir $(lib_dest)/Config.pl         $(config_dest)
+	$(CP) -r $(DESTDIR)/$(lib_dest)/Replacements      $(DESTDIR)/$(config_dest)
+	$(CP) -r $(DESTDIR)/$(lib_dest)/Bootdisk_Contents $(DESTDIR)/$(config_dest)
+	$(CP) -r $(DESTDIR)/$(lib_dest)/Config.pl         $(DESTDIR)/$(config_dest)
 	
 test:
 	$(CP) -r tests/Bootdisk_Contents.errors1 Bootdisk_Contents

--- doc/Makefile.in	Mon May 15 00:55:57 2000
+++ doc/Makefile.in	Sun Apr  8 18:06:05 2001
@@ -55,10 +55,10 @@
 man:	yard.8
 
 install:
-	$(INSTALL) --directory $(doc_dest) $(manfile_dest)
-	$(INSTALL) --group=man --mode=444 yard.8 $(manfile_dest)
+	$(INSTALL) --directory $(DESTDIR)/$(doc_dest) $(DESTDIR)$(manfile_dest)
+	$(INSTALL) --group=man --mode=444 yard.8 $(DESTDIR)$(manfile_dest)
 	for i in $(MANPAGES);\
-	  do $(LN) -f $(manfile_dest)/yard.8 $(manfile_dest)/$$i; done
+	  do $(LN) -fs yard.8 $(DESTDIR)/$(manfile_dest)/$$i; done
 
 clean:
 	$(RM) -f *.log *~ *.~ .*~ *.*.~ *.OLD *.ls \#* *.bak

--- extras/Makefile.in	Mon May 15 00:55:57 2000
+++ extras/Makefile.in	Sun Apr  8 18:00:49 2001
@@ -36,8 +36,8 @@
 
 
 install:
-	$(INSTALL) -d $(lib_dest)/extras
-	$(INSTALL_DATA) -o root $(INSTALLED_EXTRAS) $(lib_dest)/extras
+	$(INSTALL) -d $(DESTDIR)/$(lib_dest)/extras
+	$(INSTALL_DATA) -o root $(INSTALLED_EXTRAS) $(DESTDIR)/$(lib_dest)/extras
 
 clean:
 	$(RM) -f *.log *~ *.~ .*~ *.*.~ *.OLD *.ls \#* *.bak *.img