cellog          Sat Nov  5 13:19:23 2005 EDT

  Modified files:              (Branch: PHP_4_4)
    /php-src/pear       Makefile.frag 
  Log:
  don't attempt to install package-*.xml
  
http://cvs.php.net/diff.php/php-src/pear/Makefile.frag?r1=1.28.2.7&r2=1.28.2.7.4.1&ty=u
Index: php-src/pear/Makefile.frag
diff -u php-src/pear/Makefile.frag:1.28.2.7 
php-src/pear/Makefile.frag:1.28.2.7.4.1
--- php-src/pear/Makefile.frag:1.28.2.7 Mon Sep  1 21:30:13 2003
+++ php-src/pear/Makefile.frag  Sat Nov  5 13:19:23 2005
@@ -5,16 +5,13 @@
 # Skip all php.ini files altogether
 PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
 
-install-pear-installer: $(top_builddir)/sapi/cli/php
-       @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) 
$(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" 
$(srcdir)/package-*.xml
-
 install-pear-packages: $(top_builddir)/sapi/cli/php
        @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) 
$(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" 
$(srcdir)/packages/*.tar
 
 install-pear:
        @echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
        @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
-               $(MAKE) -s install-pear-installer install-pear-packages; \
+               $(MAKE) -s install-pear-packages; \
        else \
                cat $(srcdir)/install-pear.txt; \
                exit 5; \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to