* 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.

diff --git a/ChangeLog b/ChangeLog
index 08857677332a67ae07d0417c0541be8daf95878c..69f25ca097548b40ec5e5f4645c4acfe2f246ce1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-12-08  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * 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  <adl@gnu.org>
 
        * aclocal.in (check_acinclude, scan_file): Output `warning:' in

diff --git a/automake.in b/automake.in
index 4ea84eb7c2a5530e67cabf23160030c7c006af76..26e3bd3fae42edfc40b62365df6d39b11373e448 100755 (executable)
--- 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 4cf264abd91a6acb7d7b487366a278bf9146c66e..7285902205c0078e6ac261da1ad074bfc94e7988 100644 (file)
--- 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;