01-fyi-fix-errors-in-macro-define.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        
        * automake.in (&macro_define): Use $where when reporting an error,
        not the place where the macro was first defined since (i) if this
        is the first definition, then obviously it was not defined before,
        and (ii) anyway, the error is with the new definition, not the
        first.
        
Index: automake.in
--- automake.in Wed, 14 Nov 2001 21:38:24 +0100 akim
+++ automake.in Sun, 25 Nov 2001 17:43:33 +0100 akim
@@ -5680,16 +5680,16 @@ sub macro_define ($$$$$$)
     {
       if (defined $var_type{$var} && $var_type{$var} ne $type)
        {
-         macro_error ($var,
-                      ("$var was set with `$var_type{$var}=' "
-                       . "and is now set with `$type='"));
+         file_error ($where,
+                     ("$var was set with `$var_type{$var}=' "
+                      . "and is now set with `$type='"));
        }
     }
   else
     {
       if (!defined $var_type{$var} && $type eq '+')
        {
-         macro_error ($var, "$var must be set with `=' before using `+='");
+         file_error ($where, "$var must be set with `=' before using `+='");
        }
     }
   $var_type{$var} = $type;