X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=Makefile;h=e01ae9b5acc70e7dfc41aebf0d220c7e829c0356;hb=371b63f7dae515c56b777b2c2dca5135dd67781d;hp=98a6ef62e49e40bf35ea4d6594793fe25c293b19;hpb=b2388b5c24b313f5bb83f8b24510643fd7dd9672;p=live-boot-grml.git

diff --git a/Makefile b/Makefile
index 98a6ef6..e01ae9b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,14 +20,16 @@ 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-new-uuid 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 contrib/languagelist $(DESTDIR)/usr/share/live-initramfs
@@ -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*
@@ -122,9 +124,10 @@ update:
 
 	# Update language list
 	wget -O "contrib/languagelist" \
-		"http://svn.debian.org/viewsvn/\*checkout\*/d-i/trunk/packages/localechooser/languagelist"
+		"http://svn.debian.org/viewsvn/*checkout*/d-i/trunk/packages/localechooser/languagelist"
 
 clean:
+	$(MAKE) -C manpages clean
 
 distclean: