FYI: typo in macro_define

[Alexandre Duret-Lutz]

I've installed this, on HEAD and branch-1-7.  

The typo seems harmless, it only forbids Automake to overwrite
its own variables: apparently this never happens or we would
have seen some related bugs (I saw the typo while reading the
code).

2003-01-05  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (macro_define): Add missing `{$cond}' (typo from
        2002-09-18).
        ($gen_copyright): Append year 2003.
        (version): Increase year.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1365.2.26
diff -u -r1.1365.2.26 automake.in
--- automake.in 31 Dec 2002 21:25:35 -0000      1.1365.2.26
+++ automake.in 5 Jan 2003 22:48:52 -0000
@@ -6,7 +6,7 @@
     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
@@ -263,7 +263,7 @@
 
 # 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,
@@ -6494,7 +6494,7 @@
       # 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"
@@ -9309,7 +9309,7 @@
 automake (GNU $PACKAGE) $VERSION
 Written by Tom Tromey <address@hidden>.
 
-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

-- 
Alexandre Duret-Lutz