Fix uninstalling of binaries.

diff --git a/source/build/make/templates.mk b/source/build/make/templates.mk
index c0ee017a65a535947ca9c5a6d4da60aca0349b35..f7eab6ce015da54cbca1727732be8d795ac7268a 100644 (file)
--- a/source/build/make/templates.mk
+++ b/source/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
 # 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))"
 
 uninstallbin::
        @echo "Removing $(notdir $(1))"

-       @rm -f $$(DESTDIR)$$(bindir)/$(1)
+       @rm -f $$(DESTDIR)$$(bindir)/$(notdir $(1))

 endef
 
 define sbinary_install_template
 endef
 
 define sbinary_install_template


@@ -137,5 +137,5 @@ installsbin:: $$(DESTDIR)$$(sbindir)/$(notdir $(1)) installdirs
 
 uninstallsbin::
        @echo "Removing $(notdir $(1))"
 
 uninstallsbin::
        @echo "Removing $(notdir $(1))"

-       @rm -f $$(DESTDIR)$$(sbindir)/$(1)
+       @rm -f $$(DESTDIR)$$(sbindir)/$(notdir $(1))

 endef
 endef