fix Bug #43857

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index 4a5456263d8b228ef1827485ce1767b2f501a0a5..1f6f70ec0487a834b0339b804fc45d03f854a60e 100644 (file)
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -3,12 +3,15 @@
 peardir=$(PEAR_INSTALLDIR)
 
 # Skip all php.ini files altogether
-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0
+PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
+
 WGET = `which wget 2>/dev/null`
 FETCH = `which fetch 2>/dev/null`
+PEAR_PREFIX = -dp a${program_prefix}
+PEAR_SUFFIX = -ds a$(program_suffix)
 
 install-pear-installer: $(SAPI_CLI_PATH)
-       @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
+       @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
 
 install-pear:
        @echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
@@ -21,9 +24,7 @@ install-pear:
                        elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
                                "$(FETCH)" -o $(builddir)/ http://pear.php.net/install-pear-nozlib.phar; \
                        else \
-                               echo ""; \
-                               echo "No download utilities found. Don't know how to download PEAR archive."; \
-                               echo ""; \
+                               $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
                        fi \
                fi \
        fi