X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=Makefile;h=73bf2ba6f07dc4a1da0c65b3b9eb3d0e789d3e79;hb=f2a96ee75e6376f3674fbaf8a78b03c28e03c692;hp=dd0a6b96a36084e3fb68a413de5b317a40d7c49f;hpb=06b2d8214d05d3159359274dd4fa0796b78c2bbe;p=live-boot-grml.git

diff --git a/Makefile b/Makefile
index dd0a6b9..73bf2ba 100644
--- a/Makefile
+++ b/Makefile
@@ -20,17 +20,19 @@ test:
 	fi
 
 build:
+	$(MAKE) -C manpages
 
 install: test build
 	# 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-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 contrib/languagelist $(DESTDIR)/usr/share/live-initramfs
 
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools
 	cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
@@ -40,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; \
@@ -74,7 +76,7 @@ uninstall:
 	rm -f $(DESTDIR)/etc/live.conf
 
 	# Uninstalling executables
-	rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot
+	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*
@@ -111,16 +113,12 @@ uninstall:
 	rm -f $(DESTDIR)/usr/share/man/man7/live-login.7.gz
 
 update:
-	set -e; for FILE in docs/parameters.txt; \
-	do \
-		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:
+	$(MAKE) -C manpages clean
 
 distclean: