diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-29 10:50:35 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-29 10:50:35 +0200 |
| commit | 3492b7a83c4428da554213e5d84c11ea6a8c842f (patch) | |
| tree | a8a3cb50b71b6e2bc4626987a6f15a6671832aae /bin | |
| parent | 080668642dcd66242fb5b29df39f4b0b164636c7 (diff) | |
| parent | c98d5235fca742991504a7e85b9da02a08bba6dc (diff) | |
| download | automake-3492b7a83c4428da554213e5d84c11ea6a8c842f.tar.gz | |
Merge branch 'maint'
* maint:
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 735dc832a..07a63c20f 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -5704,7 +5704,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)) @@ -5722,12 +5722,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; |