Merge remote-tracking branch 'debian/debian' into ch/new_version

[live-boot-grml.git] / Makefile

diff --git a/Makefile b/Makefile
index 4e579a3..ed2471f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SHELL := sh -e
 
-LANGUAGES = en $(shell cd manpages/po && ls)
+LANGUAGES = $(shell cd manpages/po && ls)
 
 SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
 
@@ -33,7 +33,7 @@ test:
                echo "W: checkbashisms - command not found"; \
                echo "I: checkbashisms can be optained from: "; \
                echo "I:   http://git.debian.org/?p=devscripts/devscripts.git"; \
-               echo "I: On Debian systems, checkbashisms can be installed with:"; \
+               echo "I: On Debian based systems, checkbashisms can be installed with:"; \
                echo "I:   apt-get install devscripts"; \
        fi
 
@@ -45,18 +45,18 @@ install:
        mkdir -p $(DESTDIR)/sbin
        cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
 
-       mkdir -p $(DESTDIR)/usr/share/live-boot
-       cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
+       mkdir -p $(DESTDIR)/usr/share/live-boot-grml
+       cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot-grml
 
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools
        cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
 
        # Installing docs
-       mkdir -p $(DESTDIR)/usr/share/doc/live-boot
-       cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot
+       mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml
+       cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot-grml
 
-       mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples
-       cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot/examples
+       mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml/examples
+       cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot-grml/examples
        # (FIXME)
 
        # Installing manpages
@@ -78,26 +78,26 @@ install:
 uninstall:
        # Uninstalling executables
        rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin || true
 
-       rm -rf $(DESTDIR)/usr/share/live-boot
+       rm -rf $(DESTDIR)/usr/share/live-boot-grml
 
        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
 
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
 
        # Uninstalling docs
-       rm -rf $(DESTDIR)/usr/share/doc/live-boot
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+       rm -rf $(DESTDIR)/usr/share/doc/live-boot-grml
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
 
        # Uninstalling manpages
        for MANPAGE in manpages/en/*; \