From 9112c1717154cfa6247df7336f652a80a83959ac Mon Sep 17 00:00:00 2001 From: foobar Date: Thu, 24 May 2007 23:31:15 +0000 Subject: [PATCH] MFB:- Unify installation of SAPIs: CGI is no exception anymore. --- configure.in | 3 --- sapi/cgi/config9.m4 | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index c82c3a91b4..3c59983bbd 100644 --- 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 4f33505986..ebf1ad877d 100644 --- 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 -- 2.50.1