cellog Wed Sep 7 11:59:54 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/pear Makefile.frag
Log:
change makefile to use phar and not source, if present
http://cvs.php.net/diff.php/php-src/pear/Makefile.frag?r1=1.35&r2=1.35.6.1&ty=u
Index: php-src/pear/Makefile.frag
diff -u php-src/pear/Makefile.frag:1.35 php-src/pear/Makefile.frag:1.35.6.1
--- php-src/pear/Makefile.frag:1.35 Mon Sep 1 21:29:21 2003
+++ php-src/pear/Makefile.frag Wed Sep 7 11:59:53 2005
@@ -6,15 +6,12 @@
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; \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
