From: Peter Kokot <peterkokot@gmail.com>
Date: Thu, 18 Oct 2018 22:07:42 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.3.0RC4~7^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5531dde5e977dfa942e120da4a4d647688a76c2b;p=php

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
---

5531dde5e977dfa942e120da4a4d647688a76c2b
diff --cc scripts/phpize.in
index e67e3d9cc4,99250da078..afec191ccb
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@@ -11,8 -11,8 +11,8 @@@ 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.in \
 +	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 \
  	run-tests*.php tests/*.diff tests/*.exp tests/*.log tests/*.out tests/*.php"