- Moved scan_makefile_in.awk to better suitable place for it.

  (other build related scripts are under build/ too..)

diff --git a/acinclude.m4 b/acinclude.m4
index 6694b9ef13ff52a56a09b422324130aebae1929c..0b4ca2226fd2643707110c33b4f3a8cd6c8c5b9b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1240,7 +1240,7 @@ AC_DEFUN([PHP_SELECT_SAPI],[
 
 dnl deprecated
 AC_DEFUN([PHP_EXTENSION],[
-  sources=`$AWK -f $abs_srcdir/scan_makefile_in.awk < []PHP_EXT_SRCDIR($1)[]/Makefile.in`
+  sources=`$AWK -f $abs_srcdir/build/scan_makefile_in.awk < []PHP_EXT_SRCDIR($1)[]/Makefile.in`
 
   PHP_NEW_EXTENSION($1, $sources, $2, $3)
 

diff --git a/scan_makefile_in.awk b/build/scan_makefile_in.awk
similarity index 100%
rename from scan_makefile_in.awk
rename to build/scan_makefile_in.awk

diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index fa552edfca983c636434a0379cd756de2ff6b90d..8acb71a438416f4cbc453b2c69781a48944cbea0 100644 (file)
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -10,8 +10,8 @@ BUILD_FILES = \
        scripts/phpize.m4 \
        build/mkdep.awk \
        build/shtool \
+       build/scan_makefile_in.awk \
        Makefile.global \
-       scan_makefile_in.awk \
        acinclude.m4
 
 bin_SCRIPTS = phpize php-config

diff --git a/scripts/phpize.in b/scripts/phpize.in
index 66ba42068a4420525a19b3274f831298e6a5e299..ff26cb278fffbd5d993993c85d3cdc6dbb8d859e 100644 (file)
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -5,8 +5,8 @@ phpdir="$prefix/lib/php/build"
 includedir="$prefix/include/php"
 builddir="`pwd`"
 
-FILES_BUILD="mkdep.awk shtool"
-FILES="acinclude.m4 Makefile.global scan_makefile_in.awk"
+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
+FILES="acinclude.m4 Makefile.global"
 CLEAN_FILES="$FILES *.lo *.la *.o .deps .libs/ build/ include/ modules/ install-sh \
     mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
        aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache \