From ca7dcb88f332f325093fc1e603be00625364b229 Mon Sep 17 00:00:00 2001 From: Nathan Porter Date: Sat, 30 May 2020 15:39:11 -0700 Subject: [PATCH] Respect --program-prefix/suffix when installing phar Currently ./configure --enable-phar --program-suffix=7.4 will result in binaries named php7.4 and phar but should instead result in php7.4 and phar7.4 Closes GH-5650. --- ext/phar/Makefile.frag | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index 6442f33493..58789cae25 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -42,9 +42,9 @@ $(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/ install-pharcmd: pharcmd -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) - $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) - -@rm -f $(INSTALL_ROOT)$(bindir)/phar - $(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar + $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix).phar + -@rm -f $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix) + $(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix) @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 - @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1 - @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1 + @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1 + @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1 -- 2.40.0