]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorPeter Kokot <peterkokot@gmail.com>
Thu, 18 Oct 2018 22:07:42 +0000 (00:07 +0200)
committerPeter Kokot <peterkokot@gmail.com>
Thu, 18 Oct 2018 22:07:42 +0000 (00:07 +0200)
* PHP-7.1:
  [ci skip] Update NEWS
  Fix #77035: The phpize and ./configure create redundant .deps file

1  2 
.gitignore
ext/ext_skel
scripts/phpize.in
scripts/phpize.m4

diff --cc .gitignore
Simple merge
diff --cc ext/ext_skel
Simple merge
index e67e3d9cc4023d2ea9928ecd81bb963d90090444,99250da078e60c34cb3365ac91fa3f506d146989..afec191ccb2a5a33715cffdf9e059c06f780e98c
@@@ -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"
Simple merge