live-snapshot: now supports a static keep file list.

[live-boot-grml.git] / Makefile

diff --git a/Makefile b/Makefile
index d2381f1..ed1af45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,36 @@
 # Makefile
 
-BUILD_SYSTEM := $(shell lsb_release --short --id)
-
 TRANSLATIONS="it"
 
 all: build
 
 test:
+       # 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
 
+       # 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
+
 build:
-       # Setting BUILD_SYSTEM
-       sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf
 
 install: test build
        # Installing configuration
-       install -D -m 0644 live.conf $(DESTDIR)/etc/live.conf
+       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
@@ -35,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; \
@@ -108,15 +113,18 @@ uninstall:
 update:
        set -e; for FILE in docs/parameters.txt; \
        do \
-               sed -i  -e 's/2007\\-09\\-24/2007\\-10\\-01/' \
-                       -e 's/2007-09-24/2007-10-01/' \
-                       -e 's/24.09.2007/01.10.2007/' \
-                       -e 's/1.104.1/1.104.2/' \
+               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
 
 distclean: