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

diff --git a/ChangeLog b/ChangeLog
index 5a7aa3b..b5ce1cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-26  Akim Demaille  <akim@epita.fr>
+
+       * 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.
+
 2001-11-26  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * lib/am/distdir.am (distcheck): Call distcleancheck.

diff --git a/automake.in b/automake.in
index 7809f0d..4783684 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5716,16 +5716,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;