diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:09:40 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-23 16:09:40 -0800 |
| commit | fa7615af59eff77ccf383962893fee403cee45c0 (patch) | |
| tree | 0b40ebfdbc5369f67bdd1ddf49c348a490362582 | |
| parent | 7386b74b075c2a96ef788f0518d8b7aafad91ef5 (diff) | |
| parent | c7248e6359b4d0a23f4e9210f69258a6443a718b (diff) | |
| download | php-git-fa7615af59eff77ccf383962893fee403cee45c0.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
added missing INSTALL_ROOT
| -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 faa9db0c70..6516ddfabd 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 $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar + $(LN_S) -f $(INSTALL_ROOT)$(bindir)/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 |