diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:35:13 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:35:13 -0400 |
| commit | 0a36161e13484a99ccf69bb38f206462d27cc6d6 (patch) | |
| tree | d5107db4b7369603ac7c753829e8972ee74949f7 /pear | |
| parent | ce7edc9b3c7370f32fec0bc7a8ec3e29ed9a5f61 (diff) | |
| download | php-0a36161e13484a99ccf69bb38f206462d27cc6d6.tar.gz | |
Imported Upstream version 5.1.2upstream/5.1.2
Diffstat (limited to 'pear')
| -rw-r--r-- | pear/Makefile.frag | 14 | ||||
| -rw-r--r-- | pear/install-pear-nozlib.phar | bin | 3169280 -> 3156997 bytes |
2 files changed, 9 insertions, 5 deletions
diff --git a/pear/Makefile.frag b/pear/Makefile.frag index a8b1d68e4..c86d062ef 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; \ diff --git a/pear/install-pear-nozlib.phar b/pear/install-pear-nozlib.phar Binary files differindex b31afa757..b827744f7 100644 --- a/pear/install-pear-nozlib.phar +++ b/pear/install-pear-nozlib.phar |