sniper Thu Dec 4 08:41:48 2003 EDT
Modified files:
/php-src configure.in
Log:
- Fixed "make install" when INSTALL_IT is empty, like when configured
with "./configure --disable-cgi" (CLI has it's own build target)
Index: php-src/configure.in
diff -u php-src/configure.in:1.481 php-src/configure.in:1.482
--- php-src/configure.in:1.481 Wed Dec 3 00:06:04 2003
+++ php-src/configure.in Thu Dec 4 08:41:48 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.481 2003/12/03 05:06:04 jon Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.482 2003/12/04 13:41:48 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1149,10 +1149,19 @@
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)
+ install_targets="install-sapi $install_targets"
+ ;;
+ cli)
+ install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
+ ;;
+ *)
+ install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
+ ;;
+esac
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
