Making build system changes according to proposal:

http://news.php.net/article.php?group=php.dev&article=92682

diff --git a/configure.in b/configure.in
index 29e499032e2c56433f408d9eff78bf87354da3b4..640ae695a503213249d13c48f2caffe41e7741e5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1081,7 +1081,11 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-sapi install-modules $PHP_INSTALL_CLI_TARGET $install_pear"
+install_targets="install-sapi install-modules $install_pear"
+if test "$PHP_SAPI" != "cgi"; then
+  install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
+fi
+
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
 

diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index 6a0670b0c9a953a9c011fa2851fd9756d82e056c..4731c382b8d23885f1f542fd484bcf08b04a35cb 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -88,10 +88,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-cgi.exe
+        SAPI_CGI_PATH=sapi/cgi/php.exe
         ;;
       * )
-        SAPI_CGI_PATH=sapi/cgi/php-cgi
+        SAPI_CGI_PATH=sapi/cgi/php
         ;;
     esac
     PHP_SUBST(SAPI_CGI_PATH)
@@ -147,7 +147,7 @@ if test "$PHP_SAPI" = "default"; then
     AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
     AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
 
-    INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php-cgi"
+    INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
     PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, -I$PHP_FCGI_INCLUDE,'$(SAPI_CGI_PATH)')
 
     case $host_alias in