diff options
| author | Christopher Jones <sixd@php.net> | 2013-10-01 10:35:03 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-10-01 10:35:03 -0700 |
| commit | 67df40fd54b65a62340bfd107ee29e2390a92dca (patch) | |
| tree | 3b25695db8187e3fa11a88f51bd66a80ba77e236 | |
| parent | 471413ab19f1052d2f7e950229d661547f6e1657 (diff) | |
| parent | 60e38b3243577abc80ce6bbcfb0b4125b08acb85 (diff) | |
| download | php-git-67df40fd54b65a62340bfd107ee29e2390a92dca.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Revert "Make 'make distclean' remove the downloaded pear PHAR"
| -rw-r--r-- | Makefile.global | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.global b/Makefile.global index 90ac0c8e32..bd82daf4d8 100644 --- a/Makefile.global +++ b/Makefile.global @@ -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 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 pear/install-pear-nozlib.phar if test "$(srcdir)" != "$(builddir)"; then \ rm -f ext/phar/phar/phar.inc; \ fi |