From 94c6ba70c24090ea1af4a2722eda224dbf8241b2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 16 Jun 2011 22:26:17 +0200 Subject: Correct rmdir call in top-level Makefiles uninstall target to not fail if there was no prior live-boot installation. --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 138886c..f048690 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ install: uninstall: # Uninstalling executables rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile - rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin + rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin || true rm -rf $(DESTDIR)/usr/share/live-boot @@ -86,18 +86,18 @@ uninstall: 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 + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true # Uninstalling docs rm -rf $(DESTDIR)/usr/share/doc/live-boot - 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 + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true # Uninstalling manpages for MANPAGE in manpages/en/*; \ -- cgit v1.2.3