Updating debian-installer languagelist.

[live-boot-grml.git] / Makefile

diff --git a/Makefile b/Makefile
index efdb0e3..e4150c5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,36 +19,34 @@ test:
 
        @echo " done."
 
-       @echo -n "Checking for bashisms"
-
        @# We can't just fail yet on bashisms (FIXME)
-       @if [ -x /usr/bin/checkbashisms ]; \
+       @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 "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"; \
        fi
 
-       @echo " done."
-
 build:
        @echo "Nothing to build."
 
 install:
-       # (FIXME)
-       # Installing configuration
-       install -D -m 0644 conf/compcache $(DESTDIR)/usr/share/initramfs-tools/conf.d/compcache
-
        # Installing executables
        mkdir -p $(DESTDIR)/sbin
        cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
 
        mkdir -p $(DESTDIR)/usr/share/live-boot
-       cp bin/live-preseed bin/live-reconfigure contrib/languagelist $(DESTDIR)/usr/share/live-boot
+       cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
 
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools
        cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools