[SCM] live-config branch, debian, updated. debian/2.0_a12-1-4-ga5bf213
Daniel Baumann
daniel at debian.org
Thu Jul 15 17:30:08 UTC 2010
The following commit has been merged in the debian branch:
commit 25d8e20398e90484866233caa1dd019c55a86ce6
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jul 12 00:01:36 2010 +0200
Improving test targets in Makefile a bit.
diff --git a/Makefile b/Makefile
index 0b87f18..5420f27 100644
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,24 @@ test:
@echo " done."
- @echo -n "Checking for bashisms"
-
- @if [ -x /usr/bin/checkbashisms ]; \
+ @if [ ! -x "$$(which checkbashisms 2>/dev/null)" ]; \
then \
- for SCRIPT in $(SCRIPTS); \
- do \
- checkbashisms -f -x $${SCRIPT}; \
- echo -n "."; \
- done; \
- else \
- echo "WARNING: skipping bashism test - you need to install devscripts."; \
+ 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:
diff --git a/manpages/Makefile b/manpages/Makefile
index d8ec81a..31940e2 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-config
More information about the debian-live-changes
mailing list