From f8a4ccd93e97d2faf2365adb470ecca18c31d55c Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 6 Feb 2001 15:03:59 +0000 Subject: [PATCH] * automake.in (handle_dependencies): Rename AM_INCLUDE to AMINCLUDE. * m4/make.m4 (AM_MAKE_INCLUDE): Likewise. * tests/exsource.test: Likewise. --- ChangeLog | 7 +++++++ automake.in | 2 +- m4/make.m4 | 8 ++++---- tests/exsource.test | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6ee3081c..8f56c343d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-02-06 Pavel Roskin + + * 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 * autoheader.sh: only set config_h for the first call to diff --git a/automake.in b/automake.in index 6da7a26c0..19f94d9b3 100755 --- 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 2307f0f23..7a8b644be 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]) -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 00244ccd1..085cdbcf7 100755 --- 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 -- 2.47.2