MFH: Separate CGI install from install-sapi.

diff --git a/configure.in b/configure.in
index 2ac14ddde8ec403b4fe77e0916b0240b7014508e..4fc9968b3df56190cd25bc812941b69371eaaf3d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1103,10 +1103,22 @@ 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 $install_pear install-build install-headers install-programs"
-if test "$PHP_SAPI" != "cgi"; then
-  install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-fi
+install_targets="install-modules $install_pear install-build install-headers install-programs"
+
+case $PHP_SAPI in
+  cgi)
+    dnl Install CGI only (CLI is not installed even if it's enabled)
+    install_targets="install-cgi $install_targets"
+    ;;
+  cli)
+    dnl Install CLI only (--disable-cgi used, no other SAPIs enabled)
+    install_targets="install-cli $install_targets"
+    ;;
+  *)
+    dnl Install CLI and another SAPI
+    install_targets="$PHP_INSTALL_CLI_TARGET install-sapi $install_targets"
+    ;;
+esac
 
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)

diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag
index 57a3b2937c0910e392f80b511d923b661220f7a0..02398ae8b3cbe129a4692c38b1c76a5b863d5b3f 100644 (file)
--- a/sapi/cgi/Makefile.frag
+++ b/sapi/cgi/Makefile.frag
@@ -1,2 +1,6 @@
 $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
        $(BUILD_CGI)
+
+install-cgi: $(SAPI_CGI_PATH)
+       @echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
+       @$(INSTALL_CGI)

diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index beb30a91d6b62875b01e8f8b95db00ed263d9134..5f8e9b8dfe450f65cca385bba44ee33cd61153a7 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -148,7 +148,6 @@ 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"
     PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
 
     case $host_alias in
@@ -159,8 +158,10 @@ if test "$PHP_SAPI" = "default"; then
         BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
       ;;
     esac
+    INSTALL_CGI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
 
     PHP_SUBST(BUILD_CGI)
+    PHP_SUBST(INSTALL_CGI)
 
   elif test "$PHP_SAPI_CLI" != "no"; then
     AC_MSG_RESULT(no)