[SCM] live-build branch, debian-next, updated. debian/3.0_a21-1-15-gff528d0

Daniel Baumann daniel at debian.org
Thu Jun 16 20:23:42 UTC 2011


The following commit has been merged in the debian-next branch:
commit ff528d09db070be9c876c1f938c9fe4defbb966d
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jun 16 22:24:12 2011 +0200

    Correct rmdir call in top-level Makefiles uninstall target to not fail if there was no prior live-build installation.

diff --git a/Makefile b/Makefile
index b416a39..2a78628 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ install:
 uninstall:
 	# Uninstalling shared data
 	rm -rf $(DESTDIR)/usr/share/live/build
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/live
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/live || true
 
 	# Uninstalling executables
 	rm -f $(DESTDIR)/usr/bin/lb $(DESTDIR)/usr/bin/live-build

-- 
live-build



More information about the debian-live-changes mailing list