From a2d9587f1a497473c659193d6f4b69c2d273d470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Wed, 21 Feb 2007 14:13:35 +0000
Subject: [PATCH] Don't rely on PATH containing the tools directory.

---
 Makefile                 |  6 ++++--
 debian/changelog         |  8 ++++++--
 tools/make_disc_trees.pl |  2 +-
 tools/start_new_disc     | 12 ++++++------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index bd1dc304..b5d7fd23 100755
--- a/Makefile
+++ b/Makefile
@@ -354,14 +354,14 @@ image-trees: ok genlist
 	else \
 		$(merge_package_lists) $(BDIR) $(ADIR) "$(ARCHES)" $(BDIR)/packages; \
 	fi
-	$(Q)make_disc_trees.pl $(BASEDIR) $(MIRROR) $(TDIR) $(CODENAME) "$(ARCHES)" $(MKISOFS)
+	$(Q)$(BASEDIR)/tools/make_disc_trees.pl $(BASEDIR) $(MIRROR) $(TDIR) $(CODENAME) "$(ARCHES)" $(MKISOFS)
 
 # DOJIGDO actions   (for both binaries and source)
 #    0    isofile
 #    1    isofile + jigdo, cleanup_jigdo
 #    2    jigdo, cleanup_jigdo
 #
-images: ok $(OUT)
+images: ok $(OUT) $(BDIR)/md5-check
 	$(make_image) "$(BDIR)" "$(ARCHES)" "$(OUT)" "$(DOJIGDO)" "$(DEBVERSION)" "$(MIRROR)" "$(MKISOFS)" "$(MKISOFS_OPTS)" "$(JIGDO_OPTS)" "$(jigdo_cleanup)"
 
 check-number-given:
@@ -376,6 +376,8 @@ imagesums:
 
 ## MISC TARGETS ##
 
+$(BDIR)/md5-check: mirrorcheck	
+
 mirrorcheck: ok
 	$(Q)$(grab_md5) $(MIRROR) "$(ARCHES)" $(CODENAME) $(DI_CODENAME) $(BDIR)/md5-check
 	$(Q)for ARCH in $(ARCHES); do \
diff --git a/debian/changelog b/debian/changelog
index af4fc4f5..0cafc9d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,9 +20,13 @@ debian-cd (3.0.1) UNRELEASED; urgency=low
     + Add support for update DVDs
     + Change parameters used - argument should now be cd or dvd rather than
     + arches to run
-	
 
- -- Joey Hess <joeyh@debian.org>  Fri,  9 Feb 2007 23:44:25 -0500
+  [ Raphael Hertzog ]
+  * Don't rely on PATH to find make_disc_trees.pl, start_new_disc, add_files
+    and set_mkisofs_opts.
+  * Make sure "make mirrorcheck" has been called before "make images".
+
+ -- Raphael Hertzog <hertzog@debian.org>  Wed, 21 Feb 2007 12:30:27 +0100
 
 debian-cd (3.0.0) unstable; urgency=medium
 
diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl
index 4952b915..e4e6b8c7 100755
--- a/tools/make_disc_trees.pl
+++ b/tools/make_disc_trees.pl
@@ -397,7 +397,7 @@ sub get_disc_size {
 sub start_disc {
 	my $error = 0;
 
-	$error = system("start_new_disc $basedir $mirror $tdir $codename \"$archlist\" $disknum");
+	$error = system("$basedir/tools/start_new_disc $basedir $mirror $tdir $codename \"$archlist\" $disknum");
 	if ($error != 0) {
 		die "    Failed to start disc $disknum, error $error\n";
 	}
diff --git a/tools/start_new_disc b/tools/start_new_disc
index d09dffbe..b007b763 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -101,11 +101,11 @@ echo -n $VOLID                      >  $BDIR/$DISKNUM.volid
 
 if [ $BINARYDISK = 1 ] ; then
 	echo '#define TYPEbinary  1'        >> $CDDIR/README.diskdefines
-	set_mkisofs_opts bin $DISKNUM       >> $BDIR/$DISKNUM.mkisofs_opts
+	$BASEDIR/tools/set_mkisofs_opts bin $DISKNUM       >> $BDIR/$DISKNUM.mkisofs_opts
 fi
 if [ $SOURCEDISK = 1 ] ; then
 	echo '#define TYPEsource  1'        >> $CDDIR/README.diskdefines
-	set_mkisofs_opts src $DISKNUM       >> $BDIR/$DISKNUM.mkisofs_opts
+	$BASEDIR/tools/set_mkisofs_opts src $DISKNUM       >> $BDIR/$DISKNUM.mkisofs_opts
 fi
 
 if [ $DISKNUM = 1 ] ; then
@@ -118,7 +118,7 @@ if [ $DISKNUM = 1 ] ; then
 	# Add install stuff
 	if [ "$SOURCEONLY"x != "yes"x ] ; then
 		echo "  Adding tools to CD1"
-		add_files $CDDIR $MIRROR tools
+		$BASEDIR/tools/add_files $CDDIR $MIRROR tools
 	fi
 
 	echo "  Adding .disk/base_components"
@@ -202,7 +202,7 @@ if [ $DISKNUM = 1 ] ; then
 	done
 
 	echo "  Adding docs to CD1"
-    add_files $CDDIR $MIRROR doc
+    $BASEDIR/tools/add_files $CDDIR $MIRROR doc
     find $CDDIR/doc -name "dedication-*" | grep -v $DEBVERSION | xargs rm -f
     find $CDDIR/doc -name "debian-keyring.tar.gz" | xargs rm -f
 
@@ -222,7 +222,7 @@ if [ $DISKNUM = 1 ] ; then
 		if [ -e $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH ] ; then
 			echo "  Adding disks-$ARCH stuff ..."
 			mkdir -p $CDDIR/dists/$DI_CODENAME/main/disks-$ARCH
-			add_files $CDDIR/dists/$DI_CODENAME/main/disks-$ARCH $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH . 
+			$BASEDIR/tools/add_files $CDDIR/dists/$DI_CODENAME/main/disks-$ARCH $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH . 
 			touch $CDDIR/.disk/kernel_installable
 			cd $CDDIR/dists/$DI_CODENAME/main/disks-$ARCH
 			rm -rf base-images-*
@@ -242,7 +242,7 @@ fi
 > $BDIR/$DISKNUM.mkisofs_dirs
 
 echo "  Adding common docs on CD#$DISKNUM"
-add-bin-doc $DISKNUM "$ARCHES"
+$BASEDIR/tools/add-bin-doc $DISKNUM "$ARCHES"
 
 # Common stuff for all disks
 if [ "$SOURCEONLY"x = "yes"x ] ; then