X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=Makefile;h=98a6ef62e49e40bf35ea4d6594793fe25c293b19;hb=47296da8bee39d7cca4f57e572e2fdafe4eb36a5;hp=5dcc5a5b97a291bab43de5ce61f214212d548d91;hpb=05367f5461bd89ef4f281bf9483a756ddea67c45;p=live-boot-grml.git

diff --git a/Makefile b/Makefile
index 5dcc5a5..98a6ef6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,36 @@
 # 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
+	cp bin/live-preseed bin/live-reconfigure contrib/languagelist $(DESTDIR)/usr/share/live-initramfs
 
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools
 	cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
@@ -108,15 +113,18 @@ uninstall:
 update:
 	set -e; for FILE in docs/parameters.txt; \
 	do \
-		sed -i	-e 's/2007\\-10\\-01/2007\\-10\\-08/' \
-			-e 's/2007-10-01/2007-10-08/' \
-			-e 's/01.10.2007/08.10.2007/' \
-			-e 's/1.106.1/1.106.2/' \
+		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
 
+	# Update language list
+	wget -O "contrib/languagelist" \
+		"http://svn.debian.org/viewsvn/\*checkout\*/d-i/trunk/packages/localechooser/languagelist"
+
 clean:
-	rm -f live.conf
 
 distclean: