diff options
| author | Nathan Porter <nateporter@gmail.com> | 2020-05-30 15:39:11 -0700 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-05 10:10:40 +0200 |
| commit | ca7dcb88f332f325093fc1e603be00625364b229 (patch) | |
| tree | b0d51498c1350b3f9a68a9494c3bde4c3bfd33e5 | |
| parent | d65c85366dbf03c10f913358b2017931291a61ed (diff) | |
| download | php-git-ca7dcb88f332f325093fc1e603be00625364b229.tar.gz | |
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.
| -rw-r--r-- | ext/phar/Makefile.frag | 10 |
1 files 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 |