1--- php-5.3.1/pear/Makefile.frag	2009-08-02 12:11:15.000000000 -0700
2+++ php/pear/Makefile.frag	2010-02-23 23:56:10.000000000 -0800
3@@ -3,7 +3,7 @@
4 peardir=$(PEAR_INSTALLDIR)
5 
6 # Skip all php.ini files altogether
7-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
8+PEAR_INSTALL_FLAGS = -n -dphp_dir=$(INSTALL_ROOT)$(peardir) -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0
9 
10 WGET = `which wget 2>/dev/null`
11 FETCH = `which fetch 2>/dev/null`
12@@ -11,7 +11,8 @@
13 PEAR_SUFFIX = -ds a$(program_suffix)
14 
15 install-pear-installer: $(SAPI_CLI_PATH)
16-	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
17+	@echo "Installing PEAR via phar:         $(INSTALL_ROOT)/"
18+	$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
19 
20 install-pear:
21 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
22@@ -29,7 +30,7 @@
23 		fi \
24 	fi
25 	@if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
26-		$(MAKE) -s install-pear-installer; \
27+		$(MAKE) -s install-pear-installer INSTALL_ROOT=$(INSTALL_ROOT); \
28 	else \
29 		cat $(srcdir)/install-pear.txt; \
30 	fi
31