* Since debootstrap is in sbin, add sbin to PATH.

* Remove other random hadcoded paths to programs in bin.

CONF.sh

@@ -144,7 +144,7 @@ export CONTRIB=1
 # export COPYLINK=1
 
 # Options
-# export MKISOFS=/usr/bin/mkisofs
+# export MKISOFS=mkisofs
 # export MKISOFS_OPTS="-r"		#For normal users
 # export MKISOFS_OPTS="-r -F ."	#For symlink farmers
 

Makefile

@@ -47,7 +47,7 @@ ifndef SRCVOLID
 SRCVOLID="Debian $(DEBVERSION) Src-$$num"
 endif
 ifndef MKISOFS
-export MKISOFS=/usr/bin/mkisofs
+export MKISOFS=mkisofs
 endif
 ifndef MKISOFS_OPTS
 #For normal users
@@ -100,7 +100,7 @@ add_files=$(BASEDIR)/tools/add_files
 set_mkisofs_opts=$(BASEDIR)/tools/set_mkisofs_opts
 strip_nonus_bin=$(BASEDIR)/tools/strip-nonUS-bin
 add_secured=$(BASEDIR)/tools/add_secured
-md5sum=/usr/bin/md5sum
+md5sum=md5sum
 fastsums=$(BASEDIR)/tools/fast_sums
 
 BDIR=$(TDIR)/$(CODENAME)-$(ARCH)
@@ -115,6 +115,9 @@ else
 forcenonusoncd1=0
 endif
 
+# Ensure that debootstrap is in the path.
+PATH=$PATH:/usr/sbin
+
 ## DEBUG STUFF ##
 
 PrintVars:
@@ -499,7 +502,7 @@ $(BDIR)/packages-stamp:
 	$(Q)for DISK in $(FIRSTDISKS); do \
 	    DISK=$${DISK##CD}; \
 	    ok=yes; \
-	    for p in `/usr/sbin/debootstrap --arch $(ARCH) --print-debs $(CODENAME)`; do \
+	    for p in `debootstrap --arch $(ARCH) --print-debs $(CODENAME)`; do \
 		    if ! grep -q ^$$p$$ $(BDIR)/$$DISK.packages; then \
 			if [ -n "$(BASE_EXCLUDE)" ] && grep -q ^$$p$$ $(BASE_EXCLUDE); then \
 				echo "Missing debootstrap-required $$p but included in $(BASE_EXCLUDE)"; \

debian/CONF.sh

@@ -143,7 +143,7 @@ export CONTRIB=1
 # export COPYLINK=1
 
 # Options
-# export MKISOFS=/usr/bin/mkisofs
+# export MKISOFS=mkisofs
 # export MKISOFS_OPTS="-r"		#For normal users
 # export MKISOFS_OPTS="-r -F ."	#For symlink farmers
 

debian/changelog

@@ -21,8 +21,10 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
     used.
   * Don't hardcode the path to debootstrap. And assume there is a debootstrap
     available, as it is a dependency.
+  * Since debootstrap is in sbin, add sbin to PATH.
+  * Remove other random hadcoded paths to programs in bin.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 14 Sep 2005 14:20:46 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 14 Sep 2005 14:26:36 -0400
 
 debian-cd (2.2.23) unstable; urgency=low
 

tools/generate_di+k_list

@@ -49,19 +49,19 @@ lilo
 EOF
 
 /bin/sed -n 's/Package: \(kernel-image-2.4.*-386\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
   >> debian-installer+kernel-$DI_CODENAME
 /bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.4.*-386\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
   >> debian-installer+kernel-$DI_CODENAME
 /bin/sed -n 's/Package: \(kernel-image-2.6.*-386\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
   >> debian-installer+kernel-$DI_CODENAME
 /bin/sed -n 's/Package: \(kernel-headers-2.4.*-386\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
   >> debian-installer+kernel-$DI_CODENAME
 /bin/sed -n 's/Package: \(kernel-headers-2.6.*-386\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
   >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
@@ -78,13 +78,13 @@ if [ ! -e $MIRROR/dists/$CODENAME/main/binary-amd64/Packages ]; then
 	echo kernel-image-2.6.8-11-amd64-generic >> debian-installer+kernel-$DI_CODENAME
 else
 	/bin/sed -n 's/Package: \(kernel-image-2.6.*-generic\)$/\1/p' \
-	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
+	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages| tail -n 1 \
 	  >> debian-installer+kernel-$DI_CODENAME
 	/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.6.*-generic\)$/\1/p' \
-	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
+	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages| tail -n 1 \
 	  >> debian-installer+kernel-$DI_CODENAME
 	/bin/sed -n 's/Package: \(kernel-headers-2.6.*-generic\)$/\1/p' \
-	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
+	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages| tail -n 1 \
 	  >> debian-installer+kernel-$DI_CODENAME
 fi
 	 
@@ -107,7 +107,7 @@ discover1
 EOF
 
 /bin/sed -n 's/Package: \(kernel-image-2.6.*\)$/\1/p' \
-  $MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \
+  $MIRROR/dists/$CODENAME/main/binary-hppa/Packages| tail -n4 \
   >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF