* automake.in (handle_dependencies): Rename AM_INCLUDE to

AMINCLUDE.
* m4/make.m4 (AM_MAKE_INCLUDE): Likewise.
* tests/exsource.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index f6ee3081cfbb04d4696cce26785c7dce03d884bc..8f56c343d011bc675e28c70486c35e92ef43e26a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-06  Pavel Roskin  <proski@gnu.org>
+
+       * automake.in (handle_dependencies): Rename AM_INCLUDE to
+       AMINCLUDE.
+       * m4/make.m4 (AM_MAKE_INCLUDE): Likewise.
+       * tests/exsource.test: Likewise.
+
 2001-02-06  Derek Price  <derek.price@openavenue.com>
 
        * autoheader.sh: only set config_h for the first call to

diff --git a/automake.in b/automake.in
index 6da7a26c07f0a54fff92254674f4241ec971a687..19f94d9b35da39865f5b6e037e975ee323d2a59a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3018,7 +3018,7 @@ sub handle_dependencies
            $output_rules .= "\n";
            foreach $iter (@deplist)
            {
-               $output_rules .= "\@AMDEP\@\@AM_INCLUDE\@ " . $iter . "\n";
+               $output_rules .= "\@AMDEP\@\@AMINCLUDE\@ " . $iter . "\n";
            }
 
            $output_rules .= &file_contents ('depend');

diff --git a/m4/make.m4 b/m4/make.m4
index 2307f0f2351b4b4f10260d3ae89f131a63bf1933..7a8b644be1cd8b36af81dd52e148842250b06f27 100644 (file)
--- a/m4/make.m4
+++ b/m4/make.m4
@@ -10,15 +10,15 @@ doit:
 END
 # If we don't find an include directive, just comment out the code.
 AC_MSG_CHECKING([for style of include used by $am_make])
-AM_INCLUDE='#'
+AMINCLUDE='#'
 for am_inc in include .include; do
    echo "$am_inc confinc" > confmf
    if test "`$am_make -f confmf 2> /dev/null`" = "done"; then
-      AM_INCLUDE=$am_inc
+      AMINCLUDE=$am_inc
       break
    fi
 done
-AC_SUBST(AM_INCLUDE)
-AC_MSG_RESULT($AM_INCLUDE)
+AC_SUBST(AMINCLUDE)
+AC_MSG_RESULT($AMINCLUDE)
 rm -f confinc confmf
 ])

diff --git a/tests/exsource.test b/tests/exsource.test
index 00244ccd1fecfc914a21c69d857715a699bd3a54..085cdbcf7c8975f13d40d206e107ec11b658ad0a 100755 (executable)
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -29,4 +29,4 @@ END
 
 $AUTOMAKE || exit 1
 
-grep '@AM_INCLUDE@ .*/xtra\.P' Makefile.in
+grep '@AMINCLUDE@ .*/xtra\.P' Makefile.in