cvs: php-src(PHP_5_1) / configure.in /pear Makefile.frag

sniper Thu Sep 22 09:04:12 2005 EDT Modified files: (Branch: PHP_5_1) /php-src configure.in /php-src/pear Makefile.frag Log: - Fixed bug #34583 ("make install" prematurely fails because of PEAR) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.8&r2=1.579.2.9&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.8 php-src/configure.in:1.579.2.9 --- php-src/configure.in:1.579.2.8 Tue Sep 13 17:40:46 2005 +++ php-src/configure.in Thu Sep 22 09:04:10 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.8 2005/09/13 21:40:46 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.9 2005/09/22 13:04:10 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1181,7 +1181,7 @@ CXXFLAGS="$CXXFLAGS $standard_libtool_flag" all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' -install_targets="$install_modules $install_pear install-build install-headers install-programs" +install_targets="$install_modules install-build install-headers install-programs $install_pear" case $PHP_SAPI in cgi) http://cvs.php.net/diff.php/php-src/pear/Makefile.frag?r1=1.35.6.2&r2=1.35.6.3&ty=u Index: php-src/pear/Makefile.frag diff -u php-src/pear/Makefile.frag:1.35.6.2 php-src/pear/Makefile.frag:1.35.6.3 --- php-src/pear/Makefile.frag:1.35.6.2 Thu Sep 8 05:11:10 2005 +++ php-src/pear/Makefile.frag Thu Sep 22 09:04:12 2005 @@ -14,6 +14,5 @@ $(MAKE) -s install-pear-installer; \ else \ cat $(srcdir)/install-pear.txt; \ - exit 5; \ fi