diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-07-17 05:53:49 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2001-07-17 05:53:49 +0000 |
| commit | 1c4a810c9532083e2193bf16e54dc34ae8d042f0 (patch) | |
| tree | 4b5750899586819a2370453dcaa1bdd06d72cc51 /m4/make.m4 | |
| parent | 8c00243eb6bb22080843307e5fb02316009251c0 (diff) | |
| download | automake-1c4a810c9532083e2193bf16e54dc34ae8d042f0.tar.gz | |
Report from Motoyuki Kasahara:
* tests/make.test: Use am__include.
* tests/exsource.test: Use am__include.
* m4/make.m4 (AM_MAKE_INCLUDE): Use am__include and am__quote.
* automake.in (handle_languages): Use am__include and am__quote.
Diffstat (limited to 'm4/make.m4')
| -rw-r--r-- | m4/make.m4 | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/m4/make.m4 b/m4/make.m4 index 392e1d5f2..95015b267 100644 --- a/m4/make.m4 +++ b/m4/make.m4 @@ -9,8 +9,8 @@ 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='#' -_am_quote= +am__include='#' +am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf @@ -20,21 +20,21 @@ echo "include confinc" > confmf # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then - _am_include=include - _am_quote= + am__include=include + am__quote= _am_result=GNU fi # Now try BSD make style include. -if test "$_am_include" = "#"; then +if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - _am_include=.include - _am_quote='"' + am__include=.include + am__quote='"' _am_result=BSD fi fi -AC_SUBST(_am_include) -AC_SUBST(_am_quote) +AC_SUBST(am__include) +AC_SUBST(am__quote) AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) |