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 | |
| 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
| -rw-r--r-- | Makefile.global | 5 | ||||
| -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 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.global b/Makefile.global index 292c8c9947..52070edfbd 100644 --- a/Makefile.global +++ b/Makefile.global @@ -118,14 +118,13 @@ clean: rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h + rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h rm -f php5.spec main/build-defs.h scripts/phpize rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/mysqlnd/php_mysqlnd_config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak 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/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 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 |