X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=Makefile;h=082bf1e45590b257e906c579eb7de7bd365eb529;hb=41611e087d9be36c3eb8526e8cce715a47aca9ca;hp=5af515e17b600b7f06105546e8c815d571c78987;hpb=a2049b4f8507bf9c7950d553ec1172ec388304e0;p=live-boot-grml.git

diff --git a/Makefile b/Makefile
index 5af515e..082bf1e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = bin/* initramfs-tools/hooks/* initramfs-tools/scripts/live initramfs-tools/scripts/live-functions initramfs-tools/scripts/live-helpers initramfs-tools/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,24 +41,27 @@ build:
 	@echo "Nothing to build."
 
 install:
-	# Installing executables
-	mkdir -p $(DESTDIR)/sbin
-	cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
+	# Installing components
+	mkdir -p $(DESTDIR)/lib/live/boot
+	cp components/* $(DESTDIR)/lib/live/boot
 
-	mkdir -p $(DESTDIR)/usr/share/live-boot
-	cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
+	# Installing executables
+	mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks
+	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
+	for f in backend/initramfs-tools/*.script; do \
+		cp $${f} $(DESTDIR)/usr/share/initramfs-tools/scripts/$$(basename $${f} .script); \
+	done
 
-	mkdir -p $(DESTDIR)/usr/share/initramfs-tools
-	cp -r initramfs-tools/* $(DESTDIR)/usr/share/initramfs-tools
+	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 \
@@ -77,17 +80,14 @@ 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 -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*
-	rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
+	rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/live
 
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks > /dev/null 2>&1 || true
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top > /dev/null 2>&1 || true
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts > /dev/null 2>&1 || true
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools > /dev/null 2>&1 || true
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true