From: Christopher Jones <sixd@php.net>
Date: Thu, 1 Aug 2013 16:19:53 +0000 (-0700)
Subject: Clean up the 'generated' phar.inc file.
X-Git-Tag: php-5.5.2~35^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d884ec15e93fa153c845961f5e4c35ef9240eedd;p=php

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.
---

diff --git a/Makefile.global b/Makefile.global
index a868ad0d53..4edaca9cf6 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