[SCM] live-boot branch, debian, updated. debian/2.0_a12-1-5-g4178366

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 3f588cd77f13ae290b48cc360932a27be4f04496
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jul 12 00:04:37 2010 +0200

    Improving test targets in Makefile a bit.

diff --git a/Makefile b/Makefile
index 85b4b84..b24d4f8 100644
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,24 @@ test:
 
 	@echo " done."
 
+	@if [ ! -x "$$(which checkbashisms 2>/dev/null)" ]; \
+	then \
+		echo "W: checkbashisms - command not found"; \
+		echo "I: checkbashisms can be optained from: "; \
+		echo "I:   http://git.debian.org/?p=devscripts/devscripts.git"; \
+		echo "I: On Debian systems, checkbashisms can be installed with:"; \
+		echo "I:   apt-get install devscripts"; \
+		exit 0; \
+	fi
+
 	@echo -n "Checking for bashisms"
 
 	@# We can't just fail yet on bashisms (FIXME)
-	@if [ -x /usr/bin/checkbashisms ]; \
-	then \
-		for SCRIPT in $(SCRIPTS); \
-		do \
-			checkbashisms -f -x $${SCRIPT} || true; \
-			echo -n "."; \
-		done; \
-	else \
-		echo "WARNING: skipping bashism test - you need to install devscripts."; \
-	fi
+	@for SCRIPT in $(SCRIPTS); \
+	do \
+		checkbashisms -f -x $${SCRIPT} || true; \
+		echo -n "."; \
+	done
 
 	@echo " done."
 
diff --git a/manpages/Makefile b/manpages/Makefile
index 55f27fb..def1408 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -23,8 +23,10 @@ build: po4a.cfg
 	@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
 	then \
 		echo "E: po4a - command not found"; \
-		echo "I: po4a can be optained from http://po4a.alioth.debian.org/"; \
-		echo "I: On Debian systems, po4a can be installed with 'apt-get install po4a'."; \
+		echo "I: po4a can be optained from:"; \
+		echo "I:   http://po4a.alioth.debian.org/"; \
+		echo "I: On Debian systems, po4a can be installed with:"; \
+		echo "I:   apt-get install po4a"; \
 		exit 1; \
 	fi
 

-- 
live-boot