Allow 'make distclean' to clean up the 'generated' phar.inc

diff --git a/Makefile.global b/Makefile.global
index 1a1cd18569048fb32f64cea857b3f5f43c199eca..caaf6d2f50fb48ffd439b236a0fb8b3e7ae6597a 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -125,7 +125,7 @@ distclean: clean
        rm -f sapi/apache/libphp5.module sapi/apache_hooks/libphp5.module
        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 ext/phar/phar.phar ext/phar/phar.php ext/phar/phar/phar.inc
        $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
 
 .PHONY: all clean install distclean test

diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index faa9db0c706b099d35e1766db8f9f7cc4b112d3e..d95a9985a6f14a11d1cfa0b0218601156db8a667 100644 (file)
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -20,9 +20,9 @@ PHP_PHARCMD_EXECUTABLE = ` \
        fi;`
 PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
 
-$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
+$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc.in
        -@test -d $(builddir)/phar || mkdir $(builddir)/phar
-       -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc
+       -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc.in $(builddir)/phar/phar.inc
 
 $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
        -@echo "Generating phar.php"

diff --git a/ext/phar/phar/phar.inc b/ext/phar/phar/phar.inc.in
similarity index 100%
rename from ext/phar/phar/phar.inc
rename to ext/phar/phar/phar.inc.in