summaryrefslogtreecommitdiff
path: root/pear
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-12-12 12:39:50 (GMT)
committerfoobar <sniper@php.net>2005-12-12 12:39:50 (GMT)
commita8a4d7944d8317cd0ffffc1889fefc3436ad53bc (patch)
treeb318ede4d29bb220c04dae3d5b727b8367665482 /pear
parenta939717011539f60a78d60c3b95b08fb0f4442e2 (diff)
downloadphp-a8a4d7944d8317cd0ffffc1889fefc3436ad53bc.tar.gz
- Always use the builddir!
Diffstat (limited to 'pear')
-rw-r--r--pear/Makefile.frag14
1 files changed, 9 insertions, 5 deletions
diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index a8b1d68..c86d062 100644
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -5,15 +5,19 @@ peardir=$(PEAR_INSTALLDIR)
# 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; \