X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=Makefile;h=a03d75fecdf89676e33bb7dfd4595077a0280ac9;hb=c967ebfc4e43fb16a0c2c140c66900712be95ab7;hp=eb6910e04576be143426831af404cc0e4e633aa7;hpb=0a1b827c113b85f48bcd58e64ccd94d094b9bd8a;p=live-boot-grml.git

diff --git a/Makefile b/Makefile
index eb6910e..a03d75f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,38 @@
 # Makefile
 
-CFLAGS = -Wall -g -O2
-BUILD_SYSTEM := $(shell lsb_release --short --id)
-
-TRANSLATIONS=""
+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 || exit 1; \
+		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:
+	$(MAKE) -C manpages
 
 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
+	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-snapshot $(DESTDIR)/sbin
+	cp bin/live-getty bin/live-login bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(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 bin/live-set-selections 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 +42,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,14 +75,12 @@ uninstall:
 	# Uninstalling configuration
 	rm -f $(DESTDIR)/etc/live.conf
 
-	# Uninstalling live-md5check
-	rm -f $(DESTDIR)/usr/lib/live-initramfs
-
 	# Uninstalling executables
-	rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot
-	rm -f $(DESTDIR)/usr/share/live-initramfs
+	rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
+	rm -rf $(DESTDIR)/usr/share/live-initramfs
 	rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
 	rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*
+	rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
 
 	# Uninstalling documentation
 	rm -rf $(DESTDIR)/usr/share/doc/live-initramfs
@@ -115,16 +113,12 @@ uninstall:
 	rm -f $(DESTDIR)/usr/share/man/man7/live-login.7.gz
 
 update:
-	set -e; for MANPAGE in manpages/*.en.*; \
-	do \
-		sed -i	-e 's/2007\\-05\\-21/2007\\-05\\-28/' \
-			-e 's/1.87.4/1.87.5/' \
-		$$MANPAGE; \
-	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
+	$(MAKE) -C manpages clean
 
 distclean: