cellog Sun, 02 Aug 2009 19:11:15 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286687
Log: fix Bug #43857 Bug: http://bugs.php.net/43857 (Assigned) --program-suffix not always reflected everywhere Changed paths: U php/php-src/branches/PHP_5_2/pear/Makefile.frag U php/php-src/branches/PHP_5_3/pear/Makefile.frag Modified: php/php-src/branches/PHP_5_2/pear/Makefile.frag =================================================================== --- php/php-src/branches/PHP_5_2/pear/Makefile.frag 2009-08-02 17:38:57 UTC (rev 286686) +++ php/php-src/branches/PHP_5_2/pear/Makefile.frag 2009-08-02 19:11:15 UTC (rev 286687) @@ -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 @@ 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 Modified: php/php-src/branches/PHP_5_3/pear/Makefile.frag =================================================================== --- php/php-src/branches/PHP_5_3/pear/Makefile.frag 2009-08-02 17:38:57 UTC (rev 286686) +++ php/php-src/branches/PHP_5_3/pear/Makefile.frag 2009-08-02 19:11:15 UTC (rev 286687) @@ -7,9 +7,11 @@ 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)/"
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
