diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-29 10:39:58 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-29 10:39:58 +0200 |
commit | c98d5235fca742991504a7e85b9da02a08bba6dc (patch) | |
tree | 614c59988fc2bb227a0bd78f473d274792337b17 /bin | |
parent | b1b1b2995f3ef29bc0bc60055668b3d17a2d4c88 (diff) | |
parent | 030255252171248ff02da20b3f3f8c54b7bb31f9 (diff) | |
download | automake-c98d5235fca742991504a7e85b9da02a08bba6dc.tar.gz |
Merge branch 'micro' into maint
* micro:
NEWS: fix typos and grammaros
NEWS: document fix for bug#14441
Automake::Rule: consistently prepend underscore to private variables
Automake::Rule: rename: suffix_rule() -> next_in_suffix_chain()
Automake::Rule: adjust comments and POD according to previous changes
Automake::Rule: make private variables lexically scoped
suffix rules: better distinction between builtin and user-derived
Automake::Rule: expose suffix rules as a function, not a scalar
tests: expose automake bug#14441
Diffstat (limited to 'bin')
-rw-r--r-- | bin/automake.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bin/automake.in b/bin/automake.in index 8f3fb4878..24ff2a6d6 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -5861,7 +5861,7 @@ sub register_language # Update the pattern of known extensions. accept_extensions (@{$lang->extensions}); - # Update the $suffix_rule map. + # Update the suffix rules map. foreach my $suffix (@{$lang->extensions}) { foreach my $dest ($lang->output_extensions->($suffix)) @@ -5879,12 +5879,11 @@ sub derive_suffix { my ($source_ext, $obj) = @_; - while (! $extension_map{$source_ext} - && $source_ext ne $obj - && exists $suffix_rules->{$source_ext} - && exists $suffix_rules->{$source_ext}{$obj}) + while (!$extension_map{$source_ext} && $source_ext ne $obj) { - $source_ext = $suffix_rules->{$source_ext}{$obj}[0]; + my $new_source_ext = next_in_suffix_chain ($source_ext, $obj); + last if not defined $new_source_ext; + $source_ext = $new_source_ext; } return $source_ext; |