From 6d7968f2797c6f0d1a00eac595adb13d21a7e44c Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 8 Feb 2001 05:48:09 +0000
Subject: [PATCH] 	* automake.in (handle_dependencies): Use _am_include,
 not 	AMINCLUDE. 	* tests/exsource.test: Use _am_include, not AMINCLUDE.
 	* m4/make.m4 (AM_MAKE_INCLUDE): Use _am_include, not AMINCLUDE.

---
 ChangeLog           | 5 +++++
 HACKING             | 1 +
 automake.in         | 2 +-
 m4/make.m4          | 8 ++++----
 tests/exsource.test | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c661603b..359e565b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-02-07  Tom Tromey  <tromey@redhat.com>
 
+	* automake.in (handle_dependencies): Use _am_include, not
+	AMINCLUDE.
+	* tests/exsource.test: Use _am_include, not AMINCLUDE.
+	* m4/make.m4 (AM_MAKE_INCLUDE): Use _am_include, not AMINCLUDE.
+
 	* tests/Makefile.am (XFAIL_TESTS): Removed distcommon.test.
 
 	* tests/Makefile.am (EXTRA_DIST): Added ChangeLog-old.
diff --git a/HACKING b/HACKING
index d4f14a4b..a400ae44 100644
--- a/HACKING
+++ b/HACKING
@@ -42,6 +42,7 @@
   (as of Feb 7 2001) and so it isn't yet universally used.  But all
   new code should use it.
 
+
 ================================================================
 = Editing `.am' files
 
diff --git a/automake.in b/automake.in
index ef3c6bad..eafaa123 100755
--- a/automake.in
+++ b/automake.in
@@ -3018,7 +3018,7 @@ sub handle_dependencies
 	    $output_rules .= "\n";
 	    foreach $iter (@deplist)
  	    {
-		$output_rules .= "\@AMDEP\@\@AMINCLUDE\@ " . $iter . "\n";
+		$output_rules .= "\@AMDEP\@\@_am_include\@ " . $iter . "\n";
 	    }
 
 	    $output_rules .= &file_contents ('depend');
diff --git a/m4/make.m4 b/m4/make.m4
index 7a8b644b..38104717 100644
--- 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])
-AMINCLUDE='#'
+_am_include='#'
 for am_inc in include .include; do
    echo "$am_inc confinc" > confmf
    if test "`$am_make -f confmf 2> /dev/null`" = "done"; then
-      AMINCLUDE=$am_inc
+      _am_include=$am_inc
       break
    fi
 done
-AC_SUBST(AMINCLUDE)
-AC_MSG_RESULT($AMINCLUDE)
+AC_SUBST(_am_include)
+AC_MSG_RESULT($_am_include)
 rm -f confinc confmf
 ])
diff --git a/tests/exsource.test b/tests/exsource.test
index 085cdbcf..cb5bed5c 100755
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -29,4 +29,4 @@ END
 
 $AUTOMAKE || exit 1
 
-grep '@AMINCLUDE@ .*/xtra\.P' Makefile.in
+grep '@_am_include@ .*/xtra\.P' Makefile.in
-- 
2.43.5