- Unify installation of SAPIs: CGI is no exception anymore.

diff --git a/NEWS b/NEWS
index 478f3266354c4a5cfa802861d2b243518bc76868..cc655c59ad816ffb80e281059a68631846a65d77 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2007, PHP 5.2.3
+- Changed CGI install target to php-cgi and 'make install' to install CLI
+  when CGI is selected. (Jani)
 - Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
 - Optimized out a couple of per-request syscalls (Rasmus)
 - Optimized digest generation in md5() and sha1() functions. (Ilia)

diff --git a/configure.in b/configure.in
index f6162e084e55b3388736a20a9ccd09bf547d6c49..dd72f74e5c9d04501cde369c03a38f4481fd39e3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1298,9 +1298,6 @@ all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)"
 install_targets="$install_modules install-build install-headers install-programs $install_pear"
 
 case $PHP_SAPI in
-  cgi)
-    install_targets="install-sapi $install_targets"
-    ;;
   cli)
     install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
     ;;

diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index 9dc807fd1f9f40e3cbbc5e8ef5f57c78cbfd5d5a..c9ca3a3457716a875c524c90c0930f9176f66151 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -58,10 +58,10 @@ if test "$PHP_SAPI" = "default"; then
     PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag)
     case $host_alias in
       *cygwin* )
-        SAPI_CGI_PATH=sapi/cgi/php.exe
+        SAPI_CGI_PATH=sapi/cgi/php-cgi.exe
         ;;
       * )
-        SAPI_CGI_PATH=sapi/cgi/php
+        SAPI_CGI_PATH=sapi/cgi/php-cgi
         ;;
     esac
     PHP_SUBST(SAPI_CGI_PATH)
@@ -105,7 +105,7 @@ if test "$PHP_SAPI" = "default"; then
     AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ])
     AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
 
-    INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
+    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
     PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)')
 
     case $host_alias in