Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
This commit is contained in:
Christopher Jones 2013-10-01 10:35:03 -07:00
commit 67df40fd54

View file

@ -125,7 +125,6 @@ distclean: clean
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
rm -f ext/phar/phar.phar ext/phar/phar.php rm -f ext/phar/phar.phar ext/phar/phar.php
rm -f pear/install-pear-nozlib.phar
if test "$(srcdir)" != "$(builddir)"; then \ if test "$(srcdir)" != "$(builddir)"; then \
rm -f ext/phar/phar/phar.inc; \ rm -f ext/phar/phar/phar.inc; \
fi fi