[SCM] live-boot branch, debian-next, updated. debian/2.0_a15-1-2-ge0f93a7

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit e0f93a7f6181b622ef9c49b0af455aaffcf8278f
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jul 26 23:05:09 2010 +0200

    Don't fail in Makefile when there's no checkbashism.

diff --git a/Makefile b/Makefile
index b24d4f8..915f864 100644
--- a/Makefile
+++ b/Makefile
@@ -19,27 +19,24 @@ test:
 
 	@echo " done."
 
-	@if [ ! -x "$$(which checkbashisms 2>/dev/null)" ]; \
+	@# We can't just fail yet on bashisms (FIXME)
+	@if [ -x "$$(which checkbashisms 2>/dev/null)" ]; \
 	then \
+		echo -n "Checking for bashisms"; \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			checkbashisms -f -x $${SCRIPT} || true; \
+			echo -n "."; \
+		done; \
+		echo " done."; \
+	else \
 		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)
-	@for SCRIPT in $(SCRIPTS); \
-	do \
-		checkbashisms -f -x $${SCRIPT} || true; \
-		echo -n "."; \
-	done
-
-	@echo " done."
-
 build:
 	@echo "Nothing to build."
 

-- 
live-boot