mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-03-01 14:16:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

autoreconf -m now honors $MAKE.

Browse Source 
* 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>
This commit is contained in:
Ralf Wildenhues 2008-03-03 23:53:10 +01:00
parent e3d1e29bc3
commit af562c9a73
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2008-03-03 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
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 <ebb9@byu.net> 2008-03-03 Eric Blake <ebb9@byu.net>
Documentation improvements. Documentation improvements.

2
NEWS
View File

@ -65,6 +65,8 @@ GNU Autoconf NEWS - User visible changes.
** The command 'autoconf -' now correctly processes a file from stdin. ** 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' ** For all of the directory arguments for 'configure', such as '--prefix'
or '--bindir', trailing slashes are stripped. As an example, if or '--bindir', trailing slashes are stripped. As an example, if
tab completion in the user's shell appends trailing slashes, the tab completion in the user's shell appends trailing slashes, the

11
bin/autoreconf.in
View File

@ -87,7 +87,7 @@ Library directories:
-I, --include=DIR append directory DIR to search path -I, --include=DIR append directory DIR to search path
The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, ACLOCAL, 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>. Report bugs to <bug-autoconf\@gnu.org>.
"; ";
@ -110,6 +110,7 @@ my $automake = $ENV{'AUTOMAKE'} || 'automake';
my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; my $aclocal = $ENV{'ACLOCAL'} || 'aclocal';
my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint';
my $make = $ENV{'MAKE'} || 'make';
# --install -- as --add-missing in other tools. # --install -- as --add-missing in other tools.
my $install = 0; my $install = 0;
@ -127,7 +128,7 @@ my @include;
my @warning; my @warning;
# Rerun `./configure && make'? # Rerun `./configure && make'?
my $make = 0; my $run_make = 0;
# Recurse into subpackages # Recurse into subpackages
my $recursive = 1; my $recursive = 1;
@ -149,7 +150,7 @@ sub parse_args ()
'B|prepend-include=s' => \@prepend_include, 'B|prepend-include=s' => \@prepend_include,
'i|install' => \$install, 'i|install' => \$install,
's|symlink' => \$symlink, 's|symlink' => \$symlink,
'm|make' => \$make, 'm|make' => \$run_make,
'recursive!' => \$recursive); 'recursive!' => \$recursive);
# Split the warnings as a list of elements instead of a list of # Split the warnings as a list of elements instead of a list of
@ -613,7 +614,7 @@ sub autoreconf_current_directory ()
# Running make. # # Running make. #
# -------------- # # -------------- #
if ($make) if ($run_make)
{ {
if (!-f "config.status") if (!-f "config.status")
{ {
@ -629,7 +630,7 @@ sub autoreconf_current_directory ()
} }
else else
{ {
xsystem ("make"); xsystem ("$make");
} }
} }
} }

5
doc/autoconf.texi
View File

@ -1553,7 +1553,10 @@ System in a fresh tree.
@command{autopoint} (when appropriate) repeatedly to update the @command{autopoint} (when appropriate) repeatedly to update the
@acronym{GNU} Build System in the specified directories and their @acronym{GNU} Build System in the specified directories and their
subdirectories (@pxref{Subdirectories}). By default, it only remakes 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 If you install a new version of some tool, you can make
@command{autoreconf} remake @emph{all} of the files by giving it the @command{autoreconf} remake @emph{all} of the files by giving it the