From: Ralf Wildenhues Date: Sat, 14 Mar 2009 16:06:42 +0000 (+0100) Subject: gnulib-tool: use $MAKE not make in generated files X-Git-Tag: v0.1~6084 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=873e7acaac4b6c8879534a85e66e4a4f7d6347c2;p=gnulib.git 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 --- diff --git a/ChangeLog b/ChangeLog index c513eeac2..7b3c817c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-03-14 Ralf Wildenhues + 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 d47bb8123..08d1329be 100755 --- 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"