From aa1f45c96429c16098fc933c8fa2d5c0cc97e5c4 Mon Sep 17 00:00:00 2001
From: Stig Bakken <ssb@php.net>
Date: Sat, 11 May 2002 01:35:23 +0000
Subject: [PATCH] * install Archive_Tar and Console_Getopt too

---
 pear/Makefile.frag | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index e3d2f02760b42..f49b7d7650a29 100644
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -98,18 +98,18 @@ peardir=$(PEAR_INSTALLDIR)
 PEARCMD=$(top_builddir)/sapi/cli/php -d include_path=$(top_srcdir)/pear pear/scripts/pear.in
 
 install-pear-installer: $(top_builddir)/sapi/cli/php
-	@if $(PEARCMD) shell-test PEAR; then \
-	    version=`grep '<version>' $(srcdir)/package-PEAR.xml|head -1|cut -d\> -f2|cut -d\< -f1`; \
-	    if ! $(PEARCMD) shell-test PEAR $$version; then \
-		echo "Found an older version of the PEAR Installer, upgrading..."; \
-	        $(PEARCMD) -q upgrade $(srcdir)/package-PEAR.xml; \
+	@for descfile in $(srcdir)/package-*.xml; do \
+	    tmp="$${descfile%.xml}"; \
+	    pkgname="$${tmp#*-}"; \
+	    pkgver=`grep '<version>' $$descfile|head -1|cut -d\> -f2|cut -d\< -f1`; \
+	    if $(PEARCMD) shell-test $$pkgname; then \
+	    	if ! $(PEARCMD) shell-test $$pkgname $$pkgver; then \
+	    	    $(PEARCMD) -q upgrade $$descfile | sed -e "s/^/$$pkgname $$pkgver: /"; \
+	    	fi; \
 	    else \
-		echo "No need to install or upgrade the PEAR Installer..."; \
+		$(PEARCMD) -q install $$descfile | sed -e "s/^/$$pkgname $$pkgver: /"; \
 	    fi; \
-	else \
-	    echo "PEAR Installer not found, installing..."; \
-	    $(PEARCMD) -q install $(srcdir)/package-PEAR.xml; \
-	fi
+	done
 
 install-pear-packages: # requires cli installed
 	@/bin/ls -1 $(srcdir)/packages | while read package; do \