X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=blobdiff_plain;f=Makefile;h=ed1af455ce7906a7b70f4348ea1261e030c03053;hp=a9b99914bbf09bd1b6fd9781e7e7f2a6d4942128;hb=02f0fb6ca32464adc6d6dd80878ac62bd75048ec;hpb=d9ba94a9c03bae6905ff08ece35751eab82781a1

diff --git a/Makefile b/Makefile
index a9b9991..ed1af45 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,36 @@
 # Makefile
 
-CFLAGS = -Wall -g -O2
-BUILD_SYSTEM := $(shell lsb_release --short --id)
-
 TRANSLATIONS="it"
 
 all: build
 
 test:
-	set -e; for SCRIPT in hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \
+	# 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
 
-build:
-	# Setting BUILD_SYSTEM
-	sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf
+	# 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
 
-	# Building live-md5check
-	CFLAGS="$(CFLAGS)" $(MAKE) -C bin/live-md5check
+build:
 
 install: test build
 	# Installing configuration
-	install -D -m 0644 live.conf $(DESTDIR)/etc/live.conf
-
-	# Installing live-md5check
-	install -D -m 0755 bin/live-md5check/live-md5check $(DESTDIR)/usr/lib/live-initramfs/live-md5check
+	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
@@ -42,7 +40,7 @@ install: test build
 	cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-initramfs
 
 	mkdir -p $(DESTDIR)/usr/share/doc/live-initramfs/examples
-	cp -r conf/live.conf $(DESTDIR)/usr/share/doc/live-initramfs/examples
+	cp -r conf/* $(DESTDIR)/usr/share/doc/live-initramfs/examples
 
 	# Installing manpages
 	set -e; for MANPAGE in manpages/*.en.1; \
@@ -75,9 +73,6 @@ uninstall:
 	# Uninstalling configuration
 	rm -f $(DESTDIR)/etc/live.conf
 
-	# Uninstalling live-md5check
-	rm -rf $(DESTDIR)/usr/lib/live-initramfs
-
 	# Uninstalling executables
 	rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot
 	rm -rf $(DESTDIR)/usr/share/live-initramfs
@@ -116,17 +111,20 @@ uninstall:
 	rm -f $(DESTDIR)/usr/share/man/man7/live-login.7.gz
 
 update:
-	set -e; for MANPAGE in manpages/*.en.*; \
+	set -e; for FILE in docs/parameters.txt; \
 	do \
-		sed -i	-e 's/2007\\-07\\-02/2007\\-07\\-09/' \
-			-e 's/02.07.2007/09.07.2007/' \
-			-e 's/1.91.3/1.91.4/' \
-		$$MANPAGE; \
+		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
-	$(MAKE) -C bin/live-md5check clean
 
 distclean: