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

diff --git a/configure.in b/configure.in
index c82c3a91b40b0c36b3ea342976a451cbf3cc2713..3c59983bbdf1e0390a13e731fa5118300ac48a5e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1196,9 +1196,6 @@ all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)"
 install_targets="$install_modules install-build install-headers install-programs"
 
 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 4f3350598664901b2075de2ad025765e2936b54c..ebf1ad877d4bebbb0d6c5d982006f24cd1ea198d 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -44,15 +44,15 @@ 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)
 
-    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 into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
     PHP_SELECT_SAPI(cgi, program, fastcgi.c cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)')
 
     case $host_alias in