diff options
| author | foobar <sniper@php.net> | 2007-05-24 23:29:59 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2007-05-24 23:29:59 +0000 |
| commit | a894611636221767ac5e2a6ff9df99616aced7b8 (patch) | |
| tree | ab92e8723b65b349718afdb90ad68154d0c3b2bc | |
| parent | c7069887a4edeae864e9a0790e87963bbb7e90de (diff) | |
| download | php-git-a894611636221767ac5e2a6ff9df99616aced7b8.tar.gz | |
- Unify installation of SAPIs: CGI is no exception anymore.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | sapi/cgi/config9.m4 | 6 |
3 files changed, 5 insertions, 6 deletions
@@ -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 f6162e084e..dd72f74e5c 100644 --- 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 9dc807fd1f..c9ca3a3457 100644 --- 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 |