[SCM] live-config branch, debian-old-2.0, updated. debian/2.0.4-1-4-g412bd7f

[Daniel Baumann]

The following commit has been merged in the debian-old-2.0 branch:
commit 412bd7fbef44a9a384b4868e8dda9b6602d884cd
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Sep 3 19:13:17 2010 +0200

    Updating uinstall targets in makefile.

diff --git a/Makefile b/Makefile
index c54be4e..a67c638 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = de fr pt_BR
 
-SCRIPTS = bin/* scripts/*.sh scripts/config/*
+SCRIPTS = bin/* scripts/*.sh scripts/*/*
 
 all: test build
 
@@ -69,11 +69,18 @@ uninstall:
 	# Uninstalling scripts
 	rm -rf $(DESTDIR)/lib/live/config.sh $(DESTDIR)/lib/live/config
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib/live || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib || true
+
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib/live/config || true
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib/live || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/var || true
 
 	# Uninstalling docs
 	rm -rf $(DESTDIR)/usr/share/doc/live-config
+	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/*; \
@@ -91,8 +98,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-config