diff options
author | Remi Collet <remi@php.net> | 2013-07-02 10:47:38 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2013-07-02 10:47:38 +0200 |
commit | 8f0567581e942a56c8e73d4672387a38bcb43eb8 (patch) | |
tree | 7a464ac220792a8f6ad7ece7feb9ed97f59cbd91 /ext/phar/Makefile.frag | |
parent | 1968fac697946e813074c68bb9c8d2f916f9bab4 (diff) | |
parent | f4ce5e7fb65ce215ea5fd182a90aaa4d634f6023 (diff) | |
download | php-git-8f0567581e942a56c8e73d4672387a38bcb43eb8.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed Bug #65142 Missing phar man page
NEWS
Fixed Bug #65143 Missing php-cgi man page
Diffstat (limited to 'ext/phar/Makefile.frag')
-rw-r--r-- | ext/phar/Makefile.frag | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index e2b016d846..faa9db0c70 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -40,3 +40,7 @@ install-pharcmd: pharcmd $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) -@rm -f $(INSTALL_ROOT)$(bindir)/phar $(LN_S) -f $(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 + |