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

diff --git a/Makefile b/Makefile
index 915f864..6f69012 100644
--- a/Makefile
+++ b/Makefile
@@ -46,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
@@ -56,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
@@ -78,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/*; \
@@ -103,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