[SCM] live-config branch, debian, updated. debian/2.0_a15-1-14-g3a28bbc
Daniel Baumann
daniel at debian.org
Thu Jul 29 15:00:35 UTC 2010
The following commit has been merged in the debian branch:
commit d8496684c761c0fbd1f81f828c92ff7cfc1e084d
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jul 26 22:58:15 2010 +0200
Don't fail in Makefile when there's no checkbashism (Closes: #590407).
diff --git a/Makefile b/Makefile
index 96fe6d4..2f501ba 100644
--- a/Makefile
+++ b/Makefile
@@ -19,26 +19,23 @@ test:
@echo " done."
- @if [ ! -x "$$(which checkbashisms 2>/dev/null)" ]; \
+ @if [ -x "$$(which checkbashisms 2>/dev/null)" ]; \
then \
+ echo -n "Checking for bashisms"; \
+ for SCRIPT in $(SCRIPTS); \
+ do \
+ checkbashisms -f -x $${SCRIPT}; \
+ 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"
-
- @for SCRIPT in $(SCRIPTS); \
- do \
- checkbashisms -f -x $${SCRIPT}; \
- echo -n "."; \
- done
-
- @echo " done."
-
build:
@echo "Nothing to build."
--
live-config
More information about the debian-live-changes
mailing list