Merging casper 1.216.

[live-boot-grml.git] / Makefile

diff --git a/Makefile b/Makefile
index f9c9ffe..a03d75f 100644 (file)
--- 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 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
@@ -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.111.1/1.111.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: