[pacman-dev] [PATCH] 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> --- scripts/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 448057d..977aa90 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -247,7 +247,9 @@ install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(RM) $$wrapper; \ done - $(INSTALL) .lib/makepkg $(DESTDIR)$(bindir)/makepkg + for wrapper in $(WRAPPER); do \ + $(INSTALL) .lib/$${wrapper%-wrapper} $(DESTDIR)$(bindir)/$${wrapper%-wrapper}; \ + done for dir in $(LIBMAKEPKGDIRS); do \ $(MKDIR_P) $(DESTDIR)$(libmakepkgdir)/$$dir; \ done -- 2.10.1
I can confirm Johannes' patch solves the described issue. Thanks. On 10/25/16 21:02, Johannes Löthberg wrote:
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> --- scripts/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 448057d..977aa90 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -247,7 +247,9 @@ install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(RM) $$wrapper; \ done - $(INSTALL) .lib/makepkg $(DESTDIR)$(bindir)/makepkg + for wrapper in $(WRAPPER); do \ + $(INSTALL) .lib/$${wrapper%-wrapper} $(DESTDIR)$(bindir)/$${wrapper%-wrapper}; \ + done for dir in $(LIBMAKEPKGDIRS); do \ $(MKDIR_P) $(DESTDIR)$(libmakepkgdir)/$$dir; \ done
On 26/10/16 05:02, Johannes Löthberg wrote:
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> --- scripts/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 448057d..977aa90 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -247,7 +247,9 @@ install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(RM) $$wrapper; \ done - $(INSTALL) .lib/makepkg $(DESTDIR)$(bindir)/makepkg + for wrapper in $(WRAPPER); do \ + $(INSTALL) .lib/$${wrapper%-wrapper} $(DESTDIR)$(bindir)/$${wrapper%-wrapper}; \ + done
I merged this into the 'for wrapper' loop above it. Thanks, Allan
participants (3)
-
Allan McRae
-
Florian Weigelt
-
Johannes Löthberg