Commit: c940aab7895fa4cb109e7790ae14080090b04959 Author: Remi Collet <r...@php.net> Tue, 2 Jul 2013 10:42:47 +0200 Parents: 743c4864eb5c868a96d66180a562a00133861385 Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c940aab7895fa4cb109e7790ae14080090b04959 Log: Fixed Bug #65143 Missing php-cgi man page Currently php-cgi man page is a simple redirect to php (CLI) man page. Could be splited / improved in the future. Bugs: https://bugs.php.net/65143 Changed paths: M sapi/cgi/Makefile.frag M sapi/cgi/config9.m4 A sapi/cgi/php-cgi.1.in M sapi/cli/php.1.in Diff: diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag index 505119e..d54dd40 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 67251ae..49e61c8 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 0000000..340e6c5 --- /dev/null +++ b/sapi/cgi/php-cgi.1.in @@ -0,0 +1 @@ +.so man1/php.1 diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index 0e9d07a..6f0266d 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -1,6 +1,8 @@ .TH PHP 1 "2013" "The PHP Group" "Scripting Language" .SH NAME php \- PHP Command Line Interface 'CLI' +.P +php-cgi \- PHP Command Gateway Interface 'CGI' .SH SYNOPSIS .B php [options] [ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
