diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2017-06-16 22:46:16 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2017-06-16 22:46:16 +0200 |
| commit | c946ae6f25422d45e54de0fd69309cbb438f942d (patch) | |
| tree | b67bb9270a0de2dd53134f56490467135cb88c02 /bin | |
| parent | 323dabef4b3570798e2d9daedbba9b98e9d7a504 (diff) | |
| parent | 27fbeb77f96d99f41f4b6bb87eb50ae977de25a8 (diff) | |
| download | automake-c946ae6f25422d45e54de0fd69309cbb438f942d.tar.gz | |
Merge branch 'micro' into minor
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Makefile.inc | 2 | ||||
| -rw-r--r-- | bin/aclocal.in | 2 | ||||
| -rw-r--r-- | bin/automake.in | 14 | ||||
| -rwxr-xr-x | bin/gen-perl-protos | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/bin/Makefile.inc b/bin/Makefile.inc index 8ec005643..102dec9fc 100644 --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -1,4 +1,4 @@ -## Copyright (C) 1995-2015 Free Software Foundation, Inc. +## Copyright (C) 1995-2017 Free Software Foundation, Inc. ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/bin/aclocal.in b/bin/aclocal.in index 3ebd4d3fc..a4535bc47 100644 --- a/bin/aclocal.in +++ b/bin/aclocal.in @@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' # aclocal - create aclocal.m4 by scanning configure.ac -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bin/automake.in b/bin/automake.in index 09a1c956b..8db874cc7 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -6,7 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' if 0; # automake - create Makefile.in from Makefile.am -# Copyright (C) 1994-2015 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -2317,6 +2317,7 @@ sub handle_ALLOCA $lt ||= ''; my $dir = handle_LIBOBJS_or_ALLOCA "${lt}ALLOCA"; + $dir eq '' and $dir = './'; $var->requires_variables ("\@${lt}ALLOCA\@ used", $lt . 'ALLOCA'); $dep_files{$dir . '$(DEPDIR)/alloca.P' . $myobjext} = 1; require_libsource_with_macro ($cond, $var, FOREIGN, 'alloca.c'); @@ -6227,10 +6228,13 @@ sub check_trailing_slash ($\$) # read_am_file ($AMFILE, $WHERE, $RELDIR) # --------------------------------------- -# Read Makefile.am and set up %contents. Simultaneously copy lines -# from Makefile.am into $output_trailer, or define variables as -# appropriate. NOTE we put rules in the trailer section. We want -# user rules to come after our generated stuff. +# Read $AMFILE file name which is located in $RELDIR, and set up +# global variables resetted by '&generate_makefile'. Simultaneously +# copy lines from $AMFILE into '$output_trailer', or define variables +# as appropriate. +# +# NOTE: We put rules in the trailer section. We want user rules to +# come after our generated stuff. sub read_am_file { my ($amfile, $where, $reldir) = @_; diff --git a/bin/gen-perl-protos b/bin/gen-perl-protos index d78fe8a97..215d275b8 100755 --- a/bin/gen-perl-protos +++ b/bin/gen-perl-protos @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# Copyright (C) 2013-2015 Free Software Foundation, Inc. +# Copyright (C) 2013-2017 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |