gnulib-tool: use $MAKE not make in generated files

* gnulib-tool (func_create_megatestdir): Use $MAKE rather than
make in generated files.  Initialize $MAKE in the do-autobuild
script.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index c513eeac23bfaed3989328fe1cc837e7276988c9..7b3c817c47209a9ecf297acf6193929c531998f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-03-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       gnulib-tool: use $MAKE not make in generated files
+       * gnulib-tool (func_create_megatestdir): Use $MAKE rather than
+       make, in generated files.  Initialize $MAKE in the do-autobuild
+       script.
+
        * top/GNUmakefile (_have-git-version-gen): Fix typo.
 
        GNUmakefile: disable parallelism only for multiple, recursive targets

diff --git a/gnulib-tool b/gnulib-tool
index d47bb8123d60a07ab4a967d3ecb7116936791320..08d1329bedcb838d1fdaae5c8a48788764967cce 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4248,6 +4248,7 @@ func_create_megatestdir ()
                    -e 's,^\([0-9]*\) \([0-9]*\) \([0-9]*\),\3\2\1,'`
   (echo '#!/bin/sh'
    echo "CVSDATE=$cvsdate"
+   echo ": \${MAKE=make}"
    echo "test -d logs || mkdir logs"
    echo "for module in $megasubdirs; do"
    echo "  echo \"Working on module \$module...\""
@@ -4259,7 +4260,7 @@ func_create_megatestdir ()
    echo "   : autobuild revision... cvs-\$CVSDATE-000000"
    echo "   : autobuild timestamp... \`date \"+%Y%m%d-%H%M%S\"\`"
    echo "   : autobuild hostname... \`hostname\`"
-   echo "   cd \$module && ./configure \$CONFIGURE_OPTIONS && make && make check && make distclean"
+   echo "   cd \$module && ./configure \$CONFIGURE_OPTIONS && \$MAKE && \$MAKE check && \$MAKE distclean"
    echo "   echo rc=\$?"
    echo "  ) 2>&1 | { if test -n \"\$AUTOBUILD_SUBST\"; then sed -e \"\$AUTOBUILD_SUBST\"; else cat; fi; } > logs/\$safemodule"
    echo "done"