summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2008-09-10 00:09:28 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-10 00:09:28 +0200
commitce288824bb4a095c5020449a79eb83fad81e8480 (patch)
tree55b8187fd64d5d41a79d798addc810d1e1b64e13
parent96ba74ba07d257c5ee24aee1428cc5f8f539d269 (diff)
downloadsamba-ce288824bb4a095c5020449a79eb83fad81e8480.tar.gz
samba-ce288824bb4a095c5020449a79eb83fad81e8480.tar.bz2
samba-ce288824bb4a095c5020449a79eb83fad81e8480.zip
Fix uninstalling of binaries.
(This used to be commit 6ad94d10f79f206fcdeb23cf71595e38c7a77855)
-rw-r--r--source4/build/make/templates.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/make/templates.mk b/source4/build/make/templates.mk
index c0ee017a65..f7eab6ce01 100644
--- a/source4/build/make/templates.mk
+++ b/source4/build/make/templates.mk
@@ -125,11 +125,11 @@ abspath = $(shell cd $(dir $(1)); pwd)/$(notdir $(1))
# Install a binary
# Arguments: path to binary to install
define binary_install_template
-installbin:: $$(DESTDIR)$$(bindir)/$(notdir $(1))
+installbin:: $$(DESTDIR)$$(bindir)/$(notdir $(1)) installdirs
uninstallbin::
@echo "Removing $(notdir $(1))"
- @rm -f $$(DESTDIR)$$(bindir)/$(1)
+ @rm -f $$(DESTDIR)$$(bindir)/$(notdir $(1))
endef
define sbinary_install_template
@@ -137,5 +137,5 @@ installsbin:: $$(DESTDIR)$$(sbindir)/$(notdir $(1)) installdirs
uninstallsbin::
@echo "Removing $(notdir $(1))"
- @rm -f $$(DESTDIR)$$(sbindir)/$(1)
+ @rm -f $$(DESTDIR)$$(sbindir)/$(notdir $(1))
endef