diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-01 08:49:19 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-01 08:49:19 -0700 |
| commit | 1c91ca990ff673edf8aa521285986759996f0cca (patch) | |
| tree | 726298753f90e084c13828e9742a5c4c25a0d776 /Makefile.global | |
| parent | 1f6b940dd1b5d43fc2f846a2a85babb342749f05 (diff) | |
| parent | 146b933ab49f8068a5fe983bcb5c821e103e575e (diff) | |
| download | php-git-1c91ca990ff673edf8aa521285986759996f0cca.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.global b/Makefile.global index 52070edfbd..ca4ab9c230 100644 --- a/Makefile.global +++ b/Makefile.global @@ -124,7 +124,7 @@ distclean: clean rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1 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 ext/phar/phar/phar.inc + rm -f ext/phar/phar.phar ext/phar/phar.php $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f .PHONY: all clean install distclean test |