summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-03-03 23:53:10 +0100
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-03-03 23:53:44 +0100
commitaf562c9a73b817c43d1d5732b2582b9c93f0dbf9 (patch)
tree79567111618b04625670430c7dfe1d53a834aa34 /bin
parente3d1e29bc329ead5d710f944e91d8c08d7189a73 (diff)
downloadautoconf-af562c9a73b817c43d1d5732b2582b9c93f0dbf9.tar.gz
autoreconf -m now honors $MAKE.
* bin/autoreconf.in ($run_make): Renamed from ... ($make): ... this. Use now as command to run `make', overridden by $MAKE. Document this in --help output. * doc/autoconf.texi (autoreconf Invocation): Document all environment variables honored by autoreconf. * NEWS: Update. Report by Paul Eggert. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'bin')
-rw-r--r--bin/autoreconf.in11
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index fa48b201..66da78e3 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -87,7 +87,7 @@ Library directories:
-I, --include=DIR append directory DIR to search path
The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, ACLOCAL,
-AUTOPOINT, LIBTOOLIZE, M4 are honored.
+AUTOPOINT, LIBTOOLIZE, M4, and MAKE are honored.
Report bugs to <bug-autoconf\@gnu.org>.
";
@@ -110,6 +110,7 @@ my $automake = $ENV{'AUTOMAKE'} || 'automake';
my $aclocal = $ENV{'ACLOCAL'} || 'aclocal';
my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint';
+my $make = $ENV{'MAKE'} || 'make';
# --install -- as --add-missing in other tools.
my $install = 0;
@@ -127,7 +128,7 @@ my @include;
my @warning;
# Rerun `./configure && make'?
-my $make = 0;
+my $run_make = 0;
# Recurse into subpackages
my $recursive = 1;
@@ -149,7 +150,7 @@ sub parse_args ()
'B|prepend-include=s' => \@prepend_include,
'i|install' => \$install,
's|symlink' => \$symlink,
- 'm|make' => \$make,
+ 'm|make' => \$run_make,
'recursive!' => \$recursive);
# Split the warnings as a list of elements instead of a list of
@@ -613,7 +614,7 @@ sub autoreconf_current_directory ()
# Running make. #
# -------------- #
- if ($make)
+ if ($run_make)
{
if (!-f "config.status")
{
@@ -629,7 +630,7 @@ sub autoreconf_current_directory ()
}
else
{
- xsystem ("make");
+ xsystem ("$make");
}
}
}