]> granicus.if.org Git - php/commitdiff
don't attempt to install package-*.xml
authorGreg Beaver <cellog@php.net>
Sat, 5 Nov 2005 18:19:23 +0000 (18:19 +0000)
committerGreg Beaver <cellog@php.net>
Sat, 5 Nov 2005 18:19:23 +0000 (18:19 +0000)
pear/Makefile.frag

index 743fa9dae8c86a50438571c126c67a6a01d2696f..01173d5dd968a7d095285ba06d2b9ffb0422cb38 100644 (file)
@@ -5,16 +5,13 @@ peardir=$(PEAR_INSTALLDIR)
 # 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; \