diff options
Diffstat (limited to 'pear/Makefile.frag')
| -rw-r--r-- | pear/Makefile.frag | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/pear/Makefile.frag b/pear/Makefile.frag index 4a5456263d..fc7acc2f12 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag @@ -4,8 +4,6 @@ peardir=$(PEAR_INSTALLDIR) # Skip all php.ini files altogether PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 -WGET = `which wget 2>/dev/null` -FETCH = `which fetch 2>/dev/null` install-pear-installer: $(SAPI_CLI_PATH) @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" @@ -16,15 +14,7 @@ install-pear: if test -f $(srcdir)/install-pear-nozlib.phar; then \ cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ else \ - if test ! -z "$(WGET)" && test -x "$(WGET)"; then \ - "$(WGET)" http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir)/; \ - elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \ - "$(FETCH)" -o $(builddir)/ http://pear.php.net/install-pear-nozlib.phar; \ - else \ - echo ""; \ - echo "No download utilities found. Don't know how to download PEAR archive."; \ - echo ""; \ - fi \ + $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ fi \ fi @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ |