summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2016-10-25 21:02:02 +0200
committerAllan McRae <allan@archlinux.org>2016-12-05 15:20:08 +1000
commit37b73fe4fbec05e86959d234413510463ea35141 (patch)
tree8f4fbe8dbe80ee349188119e6e9c5b060045ab73
parent0dbc55a35738d0e3718f99a428253140f282ef9a (diff)
Make sure all proper scripts are installed instead of the wrappers
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 <johannes@kyriasis.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/Makefile.am5
1 files changed, 2 insertions, 3 deletions
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