gnulib-tool: Fix "Don't forget" messages

[Bruno Haible]

When bootstrapping GNU m4, gnulib-tool prints this advice:

  Don't forget to
    - "include " from within "lib/Makefile.am",
    - "include " from within "tests/Makefile.am",

Obviously, what is meant is

  Don't forget to
    - "include gnulib.mk" from within "lib/Makefile.am",
    - "include gnulib.mk" from within "tests/Makefile.am",

This patch fixes it.


2022-01-08  Bruno Haible  <bruno@clisp.org>

        gnulib-tool: Fix "Don't forget" messages (regression 2021-12-12).
        * gnulib-tool (func_import): Fix variable references in "Don't forget"
        messages.

diff --git a/gnulib-tool b/gnulib-tool
index 6f2b10cf79..455d97d9e6 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -6325,7 +6325,7 @@ s,//*$,/,'
   if test "$source_makefile_am" = Makefile.am; then
     echo "  - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in 
$configure_ac,"
   else
-    echo "  - \"include $source_makefile_name\" from within 
\"$sourcebase/Makefile.am\","
+    echo "  - \"include $source_makefile_am\" from within 
\"$sourcebase/Makefile.am\","
   fi
   if test -n "$pobase"; then
     echo "  - add \"$pobase/Makefile.in\" to AC_CONFIG_FILES in $configure_ac,"
@@ -6334,7 +6334,7 @@ s,//*$,/,'
     if test "$tests_makefile_am" = Makefile.am; then
       echo "  - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in 
$configure_ac,"
     else
-      echo "  - \"include $tests_makefile_name\" from within 
\"$testsbase/Makefile.am\","
+      echo "  - \"include $tests_makefile_am\" from within 
\"$testsbase/Makefile.am\","
     fi
   fi
   edit=0