From: Akim Demaille <akim@epita.fr>
Date: Sun, 21 Oct 2001 18:09:24 +0000 (+0000)
Subject: * automake.in (am_line_error): Clarify.
X-Git-Tag: v1.10.2~1626
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac8d39e0e470a5dd6ead6368446f9233c024ab52;p=platform%2Fupstream%2Fautomake.git

* automake.in (am_line_error): Clarify.
---

diff --git a/ChangeLog b/ChangeLog
index 69d14ad..9641195 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-10-21  Akim Demaille  <akim@epita.fr>
 
+	* automake.in (am_line_error): Clarify.
+
+	
+2001-10-21  Akim Demaille  <akim@epita.fr>
+
 	* automake.in (&am_print_error): Set $exit_status since all your
 	users do.
 	(&am_error, &am_file_error, &am_line_error, &am_conf_error):
diff --git a/automake.in b/automake.in
index 6c6b532..bdcbbd4 100755
--- a/automake.in
+++ b/automake.in
@@ -8072,37 +8072,41 @@ sub am_file_error
     am_print_error ("$file: ", @args);
 }
 
-sub am_line_error
+# &am_line_error ($SYMBOL or $LINE, @ARGS)
+# ----------------------------------------
+# Report an error about $SYMBOL.  The error message is composed of the
+# @ARGS, and try to find the location of the error of $SYMBOL.
+sub am_line_error ($@)
 {
     my ($symbol, @args) = @_;
 
     if ($symbol && "$symbol" ne '-1')
     {
-	my $file = "${am_file}.am";
-
+        my $where;
 	if ($symbol =~ /^\d+$/)
 	{
-	    # SYMBOL is a line number, so just add the colon.
-	    $file .= ':' . $symbol;
+	    # SYMBOL is a line number, then it must be a Makefile.am.
+	    $where = "${am_file}.am:$symbol";
 	}
 	elsif (defined $var_line{$symbol})
 	{
 	    # SYMBOL is a variable defined in Makefile.am, so add the
 	    # line number we saved from there.
-	    $file .= ':' . $var_line{$symbol};
+	    $where = "${am_file}.am:$var_line{$symbol}";
 	}
 	elsif (defined $configure_vars{$symbol})
 	{
 	    # SYMBOL is a variable defined in configure.ac, so add the
 	    # appropriate line number.
-	    $file = $configure_vars{$symbol};
+	    $where = $configure_vars{$symbol};
 	}
 	else
 	{
 	    # Couldn't find the line number.
+	    $where = "${am_file}.am";
 	}
 
-	am_print_error ("$file: ", @args);
+	am_file_error ($where, @args);
     }
     else
     {