Improving test targets in Makefile a bit.

diff --git a/Makefile b/Makefile
index 85b4b84..b24d4f8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,24 @@ test:
 
        @echo " done."
 
 
        @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)
        @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."
 
 
        @echo " done."
 

diff --git a/manpages/Makefile b/manpages/Makefile
index 55f27fb..def1408 100644 (file)
--- 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"; \
        @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
 
                exit 1; \
        fi