diff options
| author | Remi Collet <remi@php.net> | 2015-05-21 14:06:26 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-05-21 14:06:26 +0200 |
| commit | 17d5ebe76e8df753e1d132d58987415be50053ea (patch) | |
| tree | 1d6caa7b790021bff7a4151a72e1b40b94632b0e | |
| parent | 4fe938b0a95a0d328f57dbd2b20e62333fc3ff6c (diff) | |
| parent | a7de68f98ac563b57156c31c3b89653444af68ef (diff) | |
| download | php-git-17d5ebe76e8df753e1d132d58987415be50053ea.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69680 (phar symlink in binary directory broken).
Make the phar symlink relative
| -rw-r--r-- | ext/phar/Makefile.frag | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index 6516ddfabd..b8b1b42d43 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -39,7 +39,7 @@ install-pharcmd: pharcmd -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) -@rm -f $(INSTALL_ROOT)$(bindir)/phar - $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar + $(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar @$(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 |