sniper Mon Dec 12 12:39:50 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/pear Makefile.frag
Log:
- Always use the builddir!
http://cvs.php.net/viewcvs.cgi/php-src/pear/Makefile.frag?r1=1.35.6.8&r2=1.35.6.9&diff_format=u
Index: php-src/pear/Makefile.frag
diff -u php-src/pear/Makefile.frag:1.35.6.8 php-src/pear/Makefile.frag:1.35.6.9
--- php-src/pear/Makefile.frag:1.35.6.8 Tue Nov 15 13:29:39 2005
+++ php-src/pear/Makefile.frag Mon Dec 12 12:39:50 2005
@@ -5,15 +5,19 @@
# Skip all php.ini files altogether
PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
-derror_reporting=E_ALL -ddetect_unicode=0
-install-pear-installer: $(top_builddir)/sapi/cli/php
- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS)
$(srcdir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
+install-pear-installer: $(SAPI_CLI_PATH)
+ @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS)
$(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
install-pear:
@echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
- @if test ! -f $(srcdir)/install-pear-nozlib.phar; then \
- wget http://pear.php.net/install-pear-nozlib.phar -nd -P
$(srcdir); \
+ @if test ! -f $(builddir)/install-pear-nozlib.phar; then \
+ if test -f $(srcdir)/install-pear-nozlib.phar; then \
+ cp $(srcdir)/install-pear-nozlib.phar
$(builddir)/install-pear-nozlib.phar; \
+ else \
+ wget http://pear.php.net/install-pear-nozlib.phar -nd
-P $(builddir)/; \
+ fi \
fi
- @if test -f $(srcdir)/install-pear-nozlib.phar && $(mkinstalldirs)
$(INSTALL_ROOT)$(peardir); then \
+ @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs)
$(INSTALL_ROOT)$(peardir); then \
$(MAKE) -s install-pear-installer; \
else \
cat $(srcdir)/install-pear.txt; \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
