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.

diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag
index 505119e57288a8448bcc593edecd19c758b82bac..d54dd40808e09e3109f293d1bbd4c33ff241c3f9 100644 (file)
--- 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 67251aeb588d1f8f917a97b73db3cbbbc0f46d76..49e61c83c3da5116e76f26932251c83862a4ab05 100644 (file)
--- 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 (file)
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 0e9d07ac771deac29e5b05d7562d67c92ee58ef3..6f0266d9e5494ceb509fa73916c920b08fbaba82 100644 (file)
--- 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] [