cvs: php-src(PHP_5_1) /pear Makefile.frag
| From: | Marcus Boerger | Date: | Fri, 30 Sep 2005 17:03:22 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /pear Makefile.frag | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34199@lists.php.net to get a copy of this message | ||
helly Fri Sep 30 13:03:22 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/pear Makefile.frag
Log:
- Try to fetch the necessary file via wget
http://cvs.php.net/diff.php/php-src/pear/Makefile.frag?r1=1.35.6.3&r2=1.35.6.4&ty=u
Index: php-src/pear/Makefile.frag
diff -u php-src/pear/Makefile.frag:1.35.6.3 php-src/pear/Makefile.frag:1.35.6.4
--- php-src/pear/Makefile.frag:1.35.6.3 Thu Sep 22 09:04:12 2005
+++ php-src/pear/Makefile.frag Fri Sep 30 13:03:22 2005
@@ -3,13 +3,16 @@
peardir=$(PEAR_INSTALLDIR)
# Skip all php.ini files altogether
-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
+PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -derror_reporting=0
install-pear-installer: $(top_builddir)/sapi/cli/php
@$(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 test ! -f $(srcdir)/install-pear.phar; then \
+ wget http://pear.php.net/install-pear.phar
-nd -P $(srcdir); \
+ fi
@if test -f $(srcdir)/install-pear.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir);
then \
$(MAKE) -s install-pear-installer; \
else \