[SCM] live-boot branch, debian-next, updated. debian/3.0_a4-1-3-g845ba08

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 845ba083a7523d40f1df087496aeca92855fcdfa
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Sep 3 19:34:20 2010 +0200

    Updating uinstall targets in makefile.

diff --git a/Makefile b/Makefile
index d38a949..6f69012 100644
--- a/Makefile
+++ b/Makefile
@@ -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

-- 
live-boot