From: Greg Beaver <cellog@php.net>
Date: Wed, 7 Sep 2005 15:59:53 +0000 (+0000)
Subject: change makefile to use phar and not source, if present
X-Git-Tag: RELEASE_1_0RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38a52c5b0d9215c85709517bb75cf7125ab38093;p=php

change makefile to use phar and not source, if present
---

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index 743fa9dae8..75e25ffa3c 100644
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -6,15 +6,12 @@ peardir=$(PEAR_INSTALLDIR)
 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
+	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.phar -d "$(peardir)" -b "$(bindir)"
 
 install-pear:
 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
-	@if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
-		$(MAKE) -s install-pear-installer install-pear-packages; \
+	@if $(srcdir)/install-pear.phar $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
+		$(MAKE) -s install-pear-installer; \
 	else \
 		cat $(srcdir)/install-pear.txt; \
 		exit 5; \