X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=Makefile;h=c377644a33af875f6018017d9b5118d8f679d920;hb=47527b7666b1a12122a0b17098064e7af745d097;hp=8794b379eb92e861c8a1db4dc3304b606e4f8b7d;hpb=13040ad5e4f230cdfecd278a3bf134110fc48f87;p=live-boot-grml.git

diff --git a/Makefile b/Makefile
index 8794b37..c377644 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,33 @@
 # Makefile
 
-BUILD_SYSTEM := $(shell lsb_release --short --id)
-
 TRANSLATIONS="it"
 
 all: build
 
 test:
+	# Checking for syntax errors
 	set -e; for SCRIPT in bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \
 	do \
 		sh -n $$SCRIPT; \
 	done
 
+	# Checking for bashisms (temporary not failing, but only listing)
+	if [ -x /usr/bin/checkbashisms ]; \
+	then \
+		checkbashisms bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/* || true; \
+	else \
+		echo "bashism test skipped - you need to install devscripts."; \
+	fi
+
 build:
-	# Setting BUILD_SYSTEM
-	sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf
 
 install: test build
 	# Installing configuration
-	install -D -m 0644 live.conf $(DESTDIR)/etc/live.conf
+	install -D -m 0644 conf/live.conf $(DESTDIR)/etc/live.conf
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/sbin
-	cp bin/live-getty bin/live-login bin/live-snapshot $(DESTDIR)/sbin
+	cp bin/live-getty bin/live-login bin/live-new-uuid bin/live-snapshot $(DESTDIR)/sbin
 
 	mkdir -p $(DESTDIR)/usr/share/live-initramfs
 	cp bin/live-preseed bin/live-reconfigure $(DESTDIR)/usr/share/live-initramfs
@@ -108,15 +113,14 @@ uninstall:
 update:
 	set -e; for FILE in docs/parameters.txt; \
 	do \
-		sed -i	-e 's/2007\\-09\\-24/2007\\-10\\-01/' \
-			-e 's/2007-09-24/2007-10-01/' \
-			-e 's/24.09.2007/01.10.2007/' \
-			-e 's/1.102.2/1.102.3/' \
+		sed -i	-e 's/2007\\-11\\-19/2007\\-11\\-26/' \
+			-e 's/2007-11-19/2007-11-26/' \
+			-e 's/19.11.2007/26.11.2007/' \
+			-e 's/1.113.1/1.113.2/' \
 		$$FILE; \
 	done
 
 clean:
-	rm -f live.conf
 
 distclean: