X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=Makefile;h=082bf1e45590b257e906c579eb7de7bd365eb529;hb=8d2dac82e4d75ef257dda8304eed41b77b20bd07;hp=4aac9bc48beae0139cee7b420e921561b8cc99c3;hpb=4bd662d6947608f3a92416b599e2286718f16c61;p=live-boot-grml.git

diff --git a/Makefile b/Makefile
index 4aac9bc..082bf1e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = bin/* backends/initramfs-tools/* scripts/*.sh scripts/*/*
+SCRIPTS = backend/*/* frontend/* components/*
 
 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"; \
@@ -41,30 +41,27 @@ build:
 	@echo "Nothing to build."
 
 install:
-	# Installing scripts
-	mkdir -p $(DESTDIR)/lib/live
-	cp -r scripts/boot.sh scripts/boot $(DESTDIR)/lib/live
+	# Installing components
+	mkdir -p $(DESTDIR)/lib/live/boot
+	cp components/* $(DESTDIR)/lib/live/boot
 
 	# Installing executables
-	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 $(DESTDIR)/usr/share/live-boot
-
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks
-	cp backends/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live
+	for f in backend/initramfs-tools/*.hook; do \
+		cp $${f} $(DESTDIR)/usr/share/initramfs-tools/hooks/$$(basename $${f} .hook); \
+	done
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts
-	cp backends/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live
+	for f in backend/initramfs-tools/*.script; do \
+		cp $${f} $(DESTDIR)/usr/share/initramfs-tools/scripts/$$(basename $${f} .script); \
+	done
+
+	mkdir -p $(DESTDIR)/bin
+	cp frontend/* $(DESTDIR)/bin
 
 	# Installing docs
 	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 etc/* $(DESTDIR)/usr/share/doc/live-boot/examples
-	# (FIXME)
-
 	# Installing manpages
 	for MANPAGE in manpages/en/*; \
 	do \
@@ -83,10 +80,9 @@ install:
 
 uninstall:
 	# Uninstalling executables
-	rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin > /dev/null 2>&1 || true
-
-	rm -rf $(DESTDIR)/usr/share/live-boot
+	rm -f $(DESTDIR)/bin/live-boot
+	rm -f $(DESTDIR)/bin/live-swapfile
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/bin > /dev/null 2>&1 || true
 
 	rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
 	rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/live