diff options
author | Mathieu Lirzin <mthl@gnu.org> | 2017-06-16 23:07:00 +0200 |
---|---|---|
committer | Mathieu Lirzin <mthl@gnu.org> | 2017-06-16 23:07:00 +0200 |
commit | cc7231cc3668a387ae36905efca11f9d236c8df6 (patch) | |
tree | f0cf53f6c41586cabfead192ab344bdf7b16a77b /bin/automake.in | |
parent | 1370ce5f83c54df7ef863abb2ade73f3d5ce69e0 (diff) | |
parent | c946ae6f25422d45e54de0fd69309cbb438f942d (diff) | |
download | automake-cc7231cc3668a387ae36905efca11f9d236c8df6.tar.gz |
Merge branch 'minor'
Diffstat (limited to 'bin/automake.in')
-rw-r--r-- | bin/automake.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/automake.in b/bin/automake.in index 74990b364..9c4cb8694 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -2208,6 +2208,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'); @@ -6038,10 +6039,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) = @_; |