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 /sapi/cgi | |
| 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 'sapi/cgi')
| -rw-r--r-- | sapi/cgi/Makefile.frag | 3 | ||||
| -rw-r--r-- | sapi/cgi/config9.m4 | 2 | ||||
| -rw-r--r-- | sapi/cgi/php-cgi.1.in | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag index 505119e572..d54dd40808 100644 --- a/sapi/cgi/Makefile.frag +++ b/sapi/cgi/Makefile.frag @@ -6,4 +6,7 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS) install-cgi: $(SAPI_CGI_PATH) @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) + @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 + @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4 index 67251aeb58..49e61c83c3 100644 --- a/sapi/cgi/config9.m4 +++ b/sapi/cgi/config9.m4 @@ -71,6 +71,8 @@ if test "$PHP_CGI" != "no"; then dnl Expose to Makefile PHP_SUBST(SAPI_CGI_PATH) PHP_SUBST(BUILD_CGI) + + PHP_OUTPUT(sapi/cgi/php-cgi.1) else AC_MSG_RESULT(yes) fi diff --git a/sapi/cgi/php-cgi.1.in b/sapi/cgi/php-cgi.1.in new file mode 100644 index 0000000000..340e6c5d60 --- /dev/null +++ b/sapi/cgi/php-cgi.1.in @@ -0,0 +1 @@ +.so man1/php.1 |