cvs: php-src(PHP_5_1) /pear .cvsignore Makefile.frag

derick Fri Oct 14 09:41:49 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/pear .cvsignore Makefile.frag Log: - Use the non-zlib version of the PHAR. http://cvs.php.net/diff.php/php-src/pear/.cvsignore?r1=1.10.2.1&r2=1.10.2.2&ty=u Index: php-src/pear/.cvsignore diff -u php-src/pear/.cvsignore:1.10.2.1 php-src/pear/.cvsignore:1.10.2.2 --- php-src/pear/.cvsignore:1.10.2.1 Wed Oct 12 16:52:25 2005 +++ php-src/pear/.cvsignore Fri Oct 14 09:41:47 2005 @@ -1,4 +1,4 @@ -install-pear.phar +install-pear-nozlib.phar Makefile .deps phpize http://cvs.php.net/diff.php/php-src/pear/Makefile.frag?r1=1.35.6.5&r2=1.35.6.6&ty=u Index: php-src/pear/Makefile.frag diff -u php-src/pear/Makefile.frag:1.35.6.5 php-src/pear/Makefile.frag:1.35.6.6 --- php-src/pear/Makefile.frag:1.35.6.5 Sat Oct 1 12:05:44 2005 +++ php-src/pear/Makefile.frag Fri Oct 14 09:41:47 2005 @@ -10,10 +10,10 @@ install-pear: @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" - @if test ! -f $(srcdir)/install-pear.phar; then \ - wget http://pear.php.net/install-pear.phar -nd -P $(srcdir); \ + @if test ! -f $(srcdir)/install-pear-nozlib.phar; then \ + wget http://pear.php.net/install-pear-nozlib.phar -nd -P $(srcdir); \ fi - @if test -f $(srcdir)/install-pear.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ + @if test -f $(srcdir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ $(MAKE) -s install-pear-installer; \ else \ cat $(srcdir)/install-pear.txt; \