From: Christopher Jones <sixd@php.net>
Date: Thu, 1 Aug 2013 15:47:13 +0000 (-0700)
Subject: Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
X-Git-Tag: php-5.6.0alpha1~360^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=146b933ab49f8068a5fe983bcb5c821e103e575e;p=php

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

This reverts commit 017145bc57e604153f2a2400dd6e73a397f52f96.
---

diff --git a/Makefile.global b/Makefile.global
index 73fcdda400..a868ad0d53 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
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index d95a9985a6..faa9db0c70 100644
--- 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.in
+$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
 	-@test -d $(builddir)/phar || mkdir $(builddir)/phar
-	-@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc.in $(builddir)/phar/phar.inc
+	-@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(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.in b/ext/phar/phar/phar.inc
similarity index 100%
rename from ext/phar/phar/phar.inc.in
rename to ext/phar/phar/phar.inc