From af562c9a73b817c43d1d5732b2582b9c93f0dbf9 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 3 Mar 2008 23:53:10 +0100 Subject: [PATCH] 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 --- ChangeLog | 11 +++++++++++ NEWS | 2 ++ bin/autoreconf.in | 11 ++++++----- doc/autoconf.texi | 5 ++++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08cfd732..bfeb1de8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-03-03 Ralf Wildenhues + + 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. + 2008-03-03 Eric Blake Documentation improvements. diff --git a/NEWS b/NEWS index 855ed528..d6e3b3b5 100644 --- a/NEWS +++ b/NEWS @@ -65,6 +65,8 @@ GNU Autoconf NEWS - User visible changes. ** The command 'autoconf -' now correctly processes a file from stdin. +** 'autoreconf -m' now honors $MAKE. + ** For all of the directory arguments for 'configure', such as '--prefix' or '--bindir', trailing slashes are stripped. As an example, if tab completion in the user's shell appends trailing slashes, the 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 . "; @@ -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"); } } } diff --git a/doc/autoconf.texi b/doc/autoconf.texi index c4edf8b3..83aec6f4 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -1553,7 +1553,10 @@ System in a fresh tree. @command{autopoint} (when appropriate) repeatedly to update the @acronym{GNU} Build System in the specified directories and their subdirectories (@pxref{Subdirectories}). By default, it only remakes -those files that are older than their sources. +those files that are older than their sources. The environment variables +@env{AUTOCONF}, @env{AUTOHEADER}, @env{AUTOMAKE}, @env{ACLOCAL}, +@env{AUTOPOINT}, @env{LIBTOOLIZE}, @env{M4}, and @env{MAKE} may be used +to override the invocation of the respective tools. If you install a new version of some tool, you can make @command{autoreconf} remake @emph{all} of the files by giving it the -- 2.47.2