diff options
| author | Christopher Jones <sixd@php.net> | 2013-07-31 12:36:20 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-07-31 12:36:20 -0700 |
| commit | 1f6b940dd1b5d43fc2f846a2a85babb342749f05 (patch) | |
| tree | e5fd9795184c9b398202ed9ffbf03f920cdbc565 /ext/phar | |
| parent | 8bff800f6ae3b72453b2827c64bc9c38c62b0cab (diff) | |
| parent | c069b5f571f0d5d28d8f12cbf795155fe4c1c90b (diff) | |
| download | php-git-1f6b940dd1b5d43fc2f846a2a85babb342749f05.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Use PHP's major version when cleaning up Apache .module files
Allow 'make distclean' to clean up the 'generated' phar.inc
Diffstat (limited to 'ext/phar')
| -rw-r--r-- | ext/phar/Makefile.frag | 4 | ||||
| -rw-r--r-- | ext/phar/phar/phar.inc.in (renamed from ext/phar/phar/phar.inc) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index faa9db0c70..d95a9985a6 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 +$(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 index 7e7d61851e..7e7d61851e 100644 --- a/ext/phar/phar/phar.inc +++ b/ext/phar/phar/phar.inc.in |