From a5fc5b6d7e16ce28d332cf550803f85463aed041 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 8 Dec 2003 18:00:02 +0000 Subject: [PATCH] * lib/Automake/Variable.pm (hook): Use $$ as prototype, not $&. Perl 5.6.0 will not accept a reference sub reference for the latter. * automake.in (var_SUFFIXES_trigger): Adjust registration via Automake::Variabke::hook. (handle_texinfo_helper): Make sure `inner_expand => 1' appears on one line, so that Perl 5.6.0 does not complain about inner_expand being a bare identifier. --- ChangeLog | 11 +++++++++++ automake.in | 10 +++++----- lib/Automake/Variable.pm | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 088576773..69f25ca09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2003-12-08 Alexandre Duret-Lutz + + * lib/Automake/Variable.pm (hook): Use $$ as prototype, not $\&. + Perl 5.6.0 will not accept a reference sub reference for the + latter. + * automake.in (var_SUFFIXES_trigger): Adjust registration via + Automake::Variabke::hook. + (handle_texinfo_helper): Make sure `inner_expand => 1' appears + on one line, so that Perl 5.6.0 does not complain about + inner_expand being a bare identifier. + 2003-12-05 Alexandre Duret-Lutz * aclocal.in (check_acinclude, scan_file): Output `warning:' in diff --git a/automake.in b/automake.in index 4ea84eb7c..26e3bd3fa 100755 --- a/automake.in +++ b/automake.in @@ -560,7 +560,7 @@ sub var_SUFFIXES_trigger ($$) my ($type, $value) = @_; accept_extensions (split (' ', $value)); } -Automake::Variable::hook ('SUFFIXES', &var_SUFFIXES_trigger); +Automake::Variable::hook ('SUFFIXES', \&var_SUFFIXES_trigger); ################################################################ @@ -2720,8 +2720,8 @@ sub handle_texinfo_helper ($) @f = map { s|[^A-Za-z_0-9*\[\]\-]|\\$&|g; s|\*|[^/]*|g; $_; } @f; my $user_cleaned_files = '^(?:' . join ('|', @f) . ')$'; - foreach my $texi ($info_texinfos->value_as_list_recursive (inner_expand - => 1)) + foreach my $texi + ($info_texinfos->value_as_list_recursive (inner_expand => 1)) { my $infobase = $texi; $infobase =~ s/\.(txi|texinfo|texi)$//; @@ -3505,8 +3505,8 @@ sub rewrite_inputs_into_dependencies ($@) } # In the top-level Makefile we do not use $(top_builddir), because # we are already there, and since the targets are built without - # a $(top_builddir), it helps BSD Make to match them with - # dependencies. + # a $(top_builddir), it helps BSD Make to match them with + # dependencies. elsif ($relative_dir ne '.') { $i = '$(top_builddir)/' . $i; diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 4cf264abd..728590220 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -286,7 +286,7 @@ is the value being appended to C<$varname>. =cut use vars '%_hooks'; -sub hook ($\&) +sub hook ($$) { my ($var, $fun) = @_; $_hooks{$var} = $fun; -- 2.47.2