X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=Makefile;h=b24d4f879bff99fe6eae2687a213fdfd4a9e2b25;hb=3f588cd77f13ae290b48cc360932a27be4f04496;hp=1018daf42928e442db4cd16ca637ae5f3c5920c6;hpb=6fc8f78d026b31f4f4a3ee6507d726ddc37adbc8;p=live-boot-grml.git

diff --git a/Makefile b/Makefile
index 1018daf..b24d4f8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,14 @@ SHELL := sh -e
 
 LANGUAGES = de
 
+SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
+
 all: test build
 
 test:
 	@echo -n "Checking for syntax errors"
 
-	@for SCRIPT in bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \
+	@for SCRIPT in $(SCRIPTS); \
 	do \
 		sh -n $${SCRIPT}; \
 		echo -n "."; \
@@ -17,19 +19,24 @@ test:
 
 	@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)
-	@if [ -x /usr/bin/checkbashisms ]; \
-	then \
-		for SCRIPT in bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \
-		do \
-			checkbashisms $${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."
 
@@ -37,14 +44,9 @@ build:
 	@echo "Nothing to build."
 
 install:
-	# (FIXME)
-	# Installing configuration
-	install -D -m 0644 conf/live.conf $(DESTDIR)/etc/live.conf
-	install -D -m 0644 conf/compcache $(DESTDIR)/usr/share/initramfs-tools/conf.d/compcache
-
 	# Installing executables
 	mkdir -p $(DESTDIR)/sbin
-	cp bin/live-getty bin/live-login bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(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
@@ -77,12 +79,8 @@ install:
 	done
 
 uninstall:
-	# (FIXME)
-	# Uninstalling configuration
-	rm -f $(DESTDIR)/etc/live.conf
-
 	# Uninstalling executables
-	rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
+	rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
 	rm -rf $(DESTDIR)/usr/share/live-boot
 	rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
 	rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*