Making build system changes according to proposal:
http://news.php.net/article.php?group=php.dev&article=92682
This commit is contained in:
Edin Kadribasic 2002-12-19 17:02:40 +00:00
parent 58037935f6
commit d29309eb68
2 changed files with 8 additions and 4 deletions

View File

@ -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)

View File

@ -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