X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=blobdiff_plain;f=Makefile;h=e4150c5014bc838396986d38b9800192e60227bb;hp=85b4b849d8638fe08da3de3897c14f1bc71c2260;hb=23e0788695196000dea15780d99dc89735ade8ae;hpb=5f39ffcb7d20a0b2587d0cdee661eb23a6b4a1d4

diff --git a/Makefile b/Makefile
index 85b4b84..e4150c5 100644
--- a/Makefile
+++ b/Makefile
@@ -19,22 +19,24 @@ 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."
 
@@ -44,7 +46,7 @@ install:
 	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