From 38ceb03c5e128d0ac7b85cd98fcd5ecdaca4d9d4 Mon Sep 17 00:00:00 2001
From: Josip Rodin <joy@debian.org>
Date: Thu, 24 Jul 2003 17:41:53 +0000
Subject: [PATCH] conditionalize the BOOTDISKS stuff better

---
 Makefile                    | 13 +++++++------
 tools/sarge/installtools.sh |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 330c1510..7cccbea3 100755
--- a/Makefile
+++ b/Makefile
@@ -58,9 +58,11 @@ endif
 ifndef HOOK
 HOOK=$(BASEDIR)/tools/$(CODENAME).hook
 endif
+ifneq "$(wildcard $(MIRROR)/dists/$(CODENAME)/main/disks-$(ARCH))" ""
 ifndef BOOTDISKS
 export BOOTDISKS=$(MIRROR)/dists/$(CODENAME)/main/disks-$(ARCH)
 endif
+endif
 ifndef DOJIGDO
 export DOJIGDO=0
 endif
@@ -666,19 +668,17 @@ $(BDIR)/CD1/tools:
 		fi ; \
 	done
 
-# Add the disks-arch directories where needed
+# Add the disks-arch directories if/where needed
 disks: ok bin-infos $(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH)
 $(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH):
+ifdef BOOTDISKS
 	@echo "Adding disks-$(ARCH) stuff ..."
 	$(Q)set -e; \
 	 for DISK in $(FIRSTDISKS) ; do \
 		mkdir -p $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) ; \
-		if [ ! -e "$(BOOTDISKS)" ]; then \
-		    break; \
-		fi; \
 		$(add_files) \
-	  	$(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \
-	  	$(BOOTDISKS) . ; \
+		  $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH) \
+		  $(BOOTDISKS) . ; \
 		touch $(BDIR)/$$DISK/.disk/kernel_installable ; \
 		cd $(BDIR)/$$DISK/dists/$(CODENAME)/main/disks-$(ARCH); \
 		rm -rf base-images-*; \
@@ -692,6 +692,7 @@ $(BDIR)/CD1/dists/$(CODENAME)/main/disks-$(ARCH):
 			rm -rf [0123456789]*; \
 		fi; \
 	done
+endif
 
 upgrade: ok bin-infos $(BDIR)/upgrade-stamp
 $(BDIR)/upgrade-stamp:
diff --git a/tools/sarge/installtools.sh b/tools/sarge/installtools.sh
index 19c27fb6..09bf1382 100755
--- a/tools/sarge/installtools.sh
+++ b/tools/sarge/installtools.sh
@@ -8,7 +8,7 @@ DIR=$1
 
 DOCDIR=doc
 
-if [ -e $BOOTDISKS/current/$DOCDIR ] ; then
+if [ -n "$BOOTDISKS" -a -e $BOOTDISKS/current/$DOCDIR ] ; then
         DOCS=$BOOTDISKS/current/$DOCDIR
 else
         echo "WARNING: Using woody bootdisk documentation"