diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-03-14 17:07:21 +0100 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-03-14 17:07:21 +0100 |
| commit | 4237d0b164f7d7ba9d94a6bd9c9647c30b3c07f0 (patch) | |
| tree | 8eae5844c8de9d04e64850c7d03aeb6efbafcd4c | |
| parent | 873e7acaac4b6c8879534a85e66e4a4f7d6347c2 (diff) | |
| download | gnulib-4237d0b164f7d7ba9d94a6bd9c9647c30b3c07f0.tar.gz | |
gnulib-tool: execute $MAKE not make
* gnulib-tool: Default $MAKE to 'make'.
(func_create_testdir, func_create_megatestdir): Use $MAKE rather
than make. Initialize $MAKE in the do-autobuild script.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | gnulib-tool | 21 |
2 files changed, 18 insertions, 8 deletions
@@ -1,5 +1,10 @@ 2009-03-14 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + gnulib-tool: execute $MAKE not make + * gnulib-tool: Default $MAKE to 'make'. + (func_create_testdir, func_create_megatestdir): Use $MAKE rather + than make. Initialize $MAKE in the do-autobuild script. + 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 diff --git a/gnulib-tool b/gnulib-tool index 08d1329bed..b50b08beeb 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -63,6 +63,11 @@ if test -z "${AUTOPOINT}" || test -n "${GETTEXTPATH}"; then AUTOPOINT="${GETTEXTPATH}autopoint" fi +# You can set MAKE. +if test -z "${MAKE}"; then + MAKE=make +fi + # When using GNU sed, turn off as many GNU extensions as possible, # to minimize the risk of accidentally using non-portable features. # However, do this only for gnulib-tool itself, not for the code that @@ -4193,9 +4198,9 @@ func_create_testdir () ./configure || func_exit 1 cd "$sourcebase" echo 'built_sources: $(BUILT_SOURCES)' >> Makefile - make built_sources || func_exit 1 + $MAKE built_sources || func_exit 1 cd .. - make distclean || func_exit 1 + $MAKE distclean || func_exit 1 ) || func_exit 1 fi } @@ -4472,9 +4477,9 @@ case $mode in mkdir build cd build ../configure || func_exit 1 - make || func_exit 1 - make check || func_exit 1 - make distclean || func_exit 1 + $MAKE || func_exit 1 + $MAKE check || func_exit 1 + $MAKE distclean || func_exit 1 remaining=`find . -type f -print` if test -n "$remaining"; then echo "Remaining files:" $remaining 1>&2 @@ -4495,9 +4500,9 @@ case $mode in mkdir build cd build ../configure - make - make check - make distclean + $MAKE + $MAKE check + $MAKE distclean remaining=`find . -type f -print` if test -n "$remaining"; then echo "Remaining files:" $remaining 1>&2 |