From a10af8aa52994f3244b394fcd7d55c31f0f45d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Tue, 23 Apr 2002 13:33:37 +0000
Subject: [PATCH] * Hardcode debootstrap path ... since /usr/sbin may not be
 out of the PATH. * Print results of debootstrap checks.

---
 Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e05880da..d6ad9b06 100755
--- a/Makefile
+++ b/Makefile
@@ -326,8 +326,8 @@ ifdef FORCENONUSONCD1
 		grep-dctrl -FSection -n -sPackage -e '^(non-US|non-us/main)' - | \
 		sort | uniq > $(BDIR)/Debian_$(CODENAME)_nonUS
 endif
-	$(Q)if [ -x "`which debootstrap`" ]; then \
-		debootstrap --arch $(ARCH) --print-debs $(CODENAME) \
+	$(Q)if [ -x "/usr/sbin/debootstrap" ]; then \
+		/usr/sbin/debootstrap --arch $(ARCH) --print-debs $(CODENAME) \
 		| tr ' ' '\n' >>$(BDIR)/rawlist; \
 	fi
 	$(Q)perl -npe 's/\@ARCH\@/$(ARCH)/g' $(TASK) | \
@@ -437,16 +437,20 @@ $(BDIR)/packages-stamp:
 	@# Check that all packages required by debootstrap are included
 	@# and create .disk/base_installable if yes
 	$(Q)for DISK in $(FIRSTDISKS); do \
-	if [ -x "`which debootstrap`" ]; then \
+	if [ -x "/usr/sbin/debootstrap" ]; then \
 	    ok=yes; \
 	    DISK=$${DISK##CD}; \
-	    for p in `debootstrap --arch $(ARCH) --print-debs $(CODENAME)`; do \
+	    for p in `/usr/sbin/debootstrap --arch $(ARCH) --print-debs $(CODENAME)`; do \
 		if ! grep -q ^$$p$$ $(BDIR)/$$DISK.packages; then \
 		    ok=no; \
+		    echo "Missing debootstrap-required $p"; \
 		fi; \
 	    done; \
 	    if [ "$$ok" = "yes" ]; then \
+		echo "CD$$DISK contains all packages needed by debootstrap"; \
 		touch $(BDIR)/CD$$DISK/.disk/base_installable; \
+	    else \
+		echo "Unable to find debootstrap program"; \
 	    fi; \
 	fi; \
 	done