diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-01 09:22:47 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-01 09:22:47 -0700 |
| commit | 9cd1ac7b61a473232d867c3eb69bfb8525f0d951 (patch) | |
| tree | aa848e3d558df47708e689fa9c19fe5725805546 /Makefile.global | |
| parent | 1c91ca990ff673edf8aa521285986759996f0cca (diff) | |
| parent | d884ec15e93fa153c845961f5e4c35ef9240eedd (diff) | |
| download | php-git-9cd1ac7b61a473232d867c3eb69bfb8525f0d951.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.global b/Makefile.global index ca4ab9c230..e744e3778f 100644 --- a/Makefile.global +++ b/Makefile.global @@ -125,6 +125,9 @@ 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 + if test "$(srcdir)" != "$(builddir)"; then \ + rm -f ext/phar/phar/phar.inc; \ + fi $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f .PHONY: all clean install distclean test |