diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-19 00:07:42 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-19 00:07:42 +0200 |
| commit | 5531dde5e977dfa942e120da4a4d647688a76c2b (patch) | |
| tree | 17216d8d4362548d3e3b9f6ac0a62f0317dba30c /scripts | |
| parent | de9f325c12d631d0fcbb90d0e5cf34235d9d6073 (diff) | |
| parent | 4be0528476763d8c6bfb7a47ad62278c187ef400 (diff) | |
| download | php-git-5531dde5e977dfa942e120da4a4d647688a76c2b.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Fix #77035: The phpize and ./configure create redundant .deps file
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/phpize.in | 2 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scripts/phpize.in b/scripts/phpize.in index e67e3d9cc4..afec191ccb 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -11,7 +11,7 @@ SED="@SED@" FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4" FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" -CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \ +CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \ mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \ aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \ config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \ diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index 39f7998430..8496518c75 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -195,7 +195,6 @@ PHP_GEN_BUILD_DIRS PHP_GEN_GLOBAL_MAKEFILE test -d modules || $php_shtool mkdir modules -touch .deps AC_CONFIG_HEADER(config.h) |