diff options
| author | foobar <sniper@php.net> | 2005-09-22 13:04:12 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-09-22 13:04:12 +0000 |
| commit | cd63787e9aa8edec3234726ce4eedda7e6a9eeb7 (patch) | |
| tree | 949a716fa47559e18a9703d192f0d1d777ccf537 | |
| parent | 8bba75f0f8157daabe5de8e11144ef6f5cf93189 (diff) | |
| download | php-git-cd63787e9aa8edec3234726ce4eedda7e6a9eeb7.tar.gz | |
- Fixed bug #34583 ("make install" prematurely fails because of PEAR)
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | pear/Makefile.frag | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 5f6807ec1b..8142462cd6 100644 --- a/configure.in +++ b/configure.in @@ -1181,7 +1181,7 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" 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) diff --git a/pear/Makefile.frag b/pear/Makefile.frag index 86acc28431..376f9ad607 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag @@ -14,6 +14,5 @@ install-pear: $(MAKE) -s install-pear-installer; \ else \ cat $(srcdir)/install-pear.txt; \ - exit 5; \ fi |