X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=Makefile;h=6f69012a6df1e76199417808d69e65b8a05e0625;hb=2918768a589a8c3a70866be43abcf98098ffbb1e;hp=b24d4f879bff99fe6eae2687a213fdfd4a9e2b25;hpb=445326fea9e5636df0773595fb59b2e7f5dce8f3;p=live-boot-grml.git

diff --git a/Makefile b/Makefile
index b24d4f8..6f69012 100644
--- a/Makefile
+++ b/Makefile
@@ -19,27 +19,24 @@ test:
 
 	@echo " done."
 
-	@if [ ! -x "$$(which checkbashisms 2>/dev/null)" ]; \
+	@# We can't just fail yet on bashisms (FIXME)
+	@if [ -x "$$(which checkbashisms 2>/dev/null)" ]; \
 	then \
+		echo -n "Checking for bashisms"; \
+		for SCRIPT in $(SCRIPTS); \
+		do \
+			checkbashisms -f -x $${SCRIPT} || true; \
+			echo -n "."; \
+		done; \
+		echo " done."; \
+	else \
 		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:   apt-get install devscripts"; \
-		exit 0; \
 	fi
 
-	@echo -n "Checking for bashisms"
-
-	@# We can't just fail yet on bashisms (FIXME)
-	@for SCRIPT in $(SCRIPTS); \
-	do \
-		checkbashisms -f -x $${SCRIPT} || true; \
-		echo -n "."; \
-	done
-
-	@echo " done."
-
 build:
 	@echo "Nothing to build."
 
@@ -49,7 +46,7 @@ install:
 	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 contrib/languagelist $(DESTDIR)/usr/share/live-boot
+	cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
 
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools
 	cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
@@ -59,7 +56,7 @@ install:
 	cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot
 
 	mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples
-	cp -r conf/* $(DESTDIR)/usr/share/doc/live-boot/examples
+	cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot/examples
 	# (FIXME)
 
 	# Installing manpages
@@ -81,14 +78,26 @@ install:
 uninstall:
 	# Uninstalling executables
 	rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin
+
 	rm -rf $(DESTDIR)/usr/share/live-boot
+
 	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
+
 	# Uninstalling docs
 	rm -rf $(DESTDIR)/usr/share/doc/live-boot
-	# (FIXME)
+	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
 
 	# Uninstalling manpages
 	for MANPAGE in manpages/en/*; \
@@ -106,8 +115,22 @@ uninstall:
 		done; \
 	done
 
+	for SECTION in $(ls manpages/en/* | awk -F. '{ print $2 }'); \
+	do \
+		rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} || true; \
+		rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/*/man$${SECTION} || true; \
+	done
+
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
+
+	rmdir --ignore-fail-on-non-empty $(DESTDIR) || true
+
 clean:
+	@echo "Nothing to clean."
 
-distclean:
+distclean: clean
+	@echo "Nothing to distclean."
 
 reinstall: uninstall install