Merge branch 'debian-next' into master-next

[live-boot-grml.git] / Makefile

diff --git a/Makefile b/Makefile
index 79a9388..d083027 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = backends/*/* bin/* scripts/*.sh scripts/*/*
+SCRIPTS = backends/*/* bin/* scripts/*.sh scripts/*/*-*
 
 all: build
 
@@ -31,7 +31,7 @@ test:
                echo " done."; \
        else \
                echo "W: checkbashisms - command not found"; \
-               echo "I: checkbashisms can be optained from: "; \
+               echo "I: checkbashisms can be obtained from: "; \
                echo "I:   http://git.debian.org/?p=devscripts/devscripts.git"; \
                echo "I: On Debian based systems, checkbashisms can be installed with:"; \
                echo "I:   apt-get install devscripts"; \
@@ -46,9 +46,6 @@ install:
        cp -r scripts/boot.sh scripts/boot $(DESTDIR)/lib/live
 
        # Installing executables
-       mkdir -p $(DESTDIR)/sbin
-       cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
-
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks
        cp backends/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts
@@ -58,10 +55,6 @@ install:
        mkdir -p $(DESTDIR)/usr/share/doc/live-boot
        cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot
 
-       mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples
-       cp -r examples/* $(DESTDIR)/usr/share/doc/live-boot/examples
-       # (FIXME)
-
        # Installing manpages
        for MANPAGE in manpages/en/*; \
        do \
@@ -80,7 +73,7 @@ install:
 
 uninstall:
        # Uninstalling executables
-       rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
+       rm -f $(DESTDIR)/sbin/live-swapfile
        rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin > /dev/null 2>&1 || true
 
        rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live