From 37b73fe4fbec05e86959d234413510463ea35141 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Tue, 25 Oct 2016 21:02:02 +0200 Subject: Make sure all proper scripts are installed instead of the wrappers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After 1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee all scripts that were changed to using the wrapper for in-tree use have the wrappers installed to the system instead of the actual script, so change the install command to support all wrapped scripts instead of just makepkg. Signed-off-by: Johannes Löthberg Signed-off-by: Allan McRae --- scripts/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 448057dc..1ce460d1 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -244,10 +244,9 @@ uninstall-local: install-exec-hook: for wrapper in $(WRAPPER); do \ - cd $(DESTDIR)$(bindir) && \ - $(RM) $$wrapper; \ + $(RM) $(DESTDIR)$(bindir)/$${wrapper}; \ + $(INSTALL) .lib/$${wrapper%-wrapper} $(DESTDIR)$(bindir)/$${wrapper%-wrapper}; \ done - $(INSTALL) .lib/makepkg $(DESTDIR)$(bindir)/makepkg for dir in $(LIBMAKEPKGDIRS); do \ $(MKDIR_P) $(DESTDIR)$(libmakepkgdir)/$$dir; \ done -- cgit v1.2.3-24-g4f1b