Some weeks ago someone complained in IRC that "make uninstall" wasn't
working, and he was right. The attached patch should make it work
again.
This applies on top of my other Makefile patches, so if you decide to
amend them in some way and there are merge conflicts, either fix them
yourself or let me know and I'll adjust it :)
Florian
--
www.the-compiler.org | Top-posting sucks! http://s.cmpl.cc/top
I love long mails! | http://email.is-not-s.ms/
Blessed be those who initiate lively discussions with the hopelessly mute, for
they shall be know as Dentists.
From fcf0bf8fff74887b465d7fc32892d2e2e9b3f70d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git _at_ the _minus_ compiler _dot_ org>
Date: Tue, 13 Aug 2013 11:13:45 +0200
Subject: [PATCH] Fix make uninstall
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 8e9bd60..8288299 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@ install-nodoc: all-nodoc
uninstall:
@echo "==> deleting files..."
- $(foreach TARGET,$(TARGETS),-$(RM) '$(DESTDIR)$(BINDIR)/$(TARGET)';)
+ -$(foreach TARGET,$(TARGETS),$(RM) '$(DESTDIR)$(BINDIR)/$(TARGET)';)
-$(RM) '$(DESTDIR)$(LICENSEDIR)/LICENSE'
-$(RM) '$(DESTDIR)$(MAN1DIR)/herbstclient.1'
-$(RM) '$(DESTDIR)$(MAN1DIR)/herbstluftwm.1'
@@ -150,7 +150,7 @@ uninstall:
-$(RM) '$(DESTDIR)$(ZSHCOMPLETIONDIR)/_herbstclient'
-$(RM) '$(DESTDIR)$(XSESSIONSDIR)/herbstluftwm.desktop'
-$(RM) '$(DESTDIR)$(EXAMPLESDIR)/README'
- $(foreach SCRIPT,$(wildcard '$(DESTDIR)$(EXAMPLESDIR)/*.sh'),-$(RM)
'$(SCRIPT)';)
+ -$(RM) '$(DESTDIR)$(EXAMPLESDIR)'/*.sh
@echo "==> deleting directories..."
-$(RMDIR) '$(EXAMPLESDIR)'
-$(RMDIR) '$(DOCDIR)'
--
1.8.3.4
Attachment:
pgpuOISh6ITz8.pgp
Description: PGP signature