* automake.in (macro_define): Add missing `{$cond}' (typo from

2002-09-18).
($gen_copyright): Append year 2003.
(version): Increase year.

diff --git a/ChangeLog b/ChangeLog
index 3e8b6caa1b9afa383b718144d88af3e78c6f601a..e7c67459e3f865e9f5f178443baa04a4ce7c79dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-01-05  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * automake.in (macro_define): Add missing `{$cond}' (typo from
+       2002-09-18).
+       ($gen_copyright): Append year 2003.
+       (version): Increase year.
+
        * tests/defs.in: Substitute aclocaldir instead of running
        the installed aclocal.  Otherwise Libtool and Gettext
        tests get skipped when aclocal doesn't preexist.

diff --git a/automake.in b/automake.in
index b0d3764f57cfa975481cb02158f69007b7238b7a..961e887e8eee94b521640f89d5f01e8f675966aa 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6,7 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
     if 0;
 
 # automake - create Makefile.in from Makefile.am
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -268,7 +268,7 @@ my %ac_macro_for_var =
 
 # Copyright on generated Makefile.ins.
 my $gen_copyright = "\
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6247,7 +6247,7 @@ sub macro_define ($$$$$$)
       # If Automake tries to override a value specified by the user,
       # just don't let it do.
       if (exists $var_value{$var}{$cond}
-         && $var_owner{$var} != VAR_AUTOMAKE
+         && $var_owner{$var}{$cond} != VAR_AUTOMAKE
          && $owner == VAR_AUTOMAKE)
        {
          verb ("refusing to override the user definition of:\n"
@@ -8995,7 +8995,7 @@ sub version ()
 automake (GNU $PACKAGE) $VERSION
 Written by Tom Tromey <tromey\@redhat.com>.
 
-Copyright 2002 Free Software Foundation, Inc.
+Copyright 2003 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 EOF