- Always use the builddir!

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index a8b1d68e4418497aa685cf9acbfaf26d82ff2ed5..c86d062ef109d27ebdec887637dccc3c655bd472 100644 (file)
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -5,15 +5,19 @@ peardir=$(PEAR_INSTALLDIR)
 # Skip all php.ini files altogether
 PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -derror_reporting=E_ALL -ddetect_unicode=0
 
-install-pear-installer: $(top_builddir)/sapi/cli/php
-       @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
+install-pear-installer: $(SAPI_CLI_PATH)
+       @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
 
 install-pear:
        @echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
-       @if test ! -f $(srcdir)/install-pear-nozlib.phar; then \
-               wget http://pear.php.net/install-pear-nozlib.phar -nd -P $(srcdir);  \
+       @if test ! -f $(builddir)/install-pear-nozlib.phar; then \
+               if test -f $(srcdir)/install-pear-nozlib.phar; then \
+                       cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
+               else \
+                       wget http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir)/;  \
+               fi \
        fi
-       @if test -f $(srcdir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
+       @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
                $(MAKE) -s install-pear-installer; \
        else \
                cat $(srcdir)/install-pear.txt; \