--- php-5.3.1/pear/Makefile.frag 2009-08-02 12:11:15.000000000 -0700
+++ php/pear/Makefile.frag 2010-02-23 23:56:10.000000000 -0800
@@ -3,7 +3,7 @@
peardir=$(PEAR_INSTALLDIR)
# Skip all php.ini files altogether
-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
+PEAR_INSTALL_FLAGS = -n -dphp_dir=$(INSTALL_ROOT)$(peardir) -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
WGET = `which wget 2>/dev/null`
FETCH = `which fetch 2>/dev/null`
@@ -11,7 +11,8 @@
PEAR_SUFFIX = -ds a$(program_suffix)
install-pear-installer: $(SAPI_CLI_PATH)
- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+ @echo "Installing PEAR via phar: $(INSTALL_ROOT)/"
+ $(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)/"
@@ -29,7 +30,7 @@
fi \
fi
@if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
- $(MAKE) -s install-pear-installer; \
+ $(MAKE) -s install-pear-installer INSTALL_ROOT=$(INSTALL_ROOT); \
else \
cat $(srcdir)/install-pear.txt; \
fi