summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--aclocal.in3
-rw-r--r--lib/Automake/XFile.pm5
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d5a59ab9..ad0f0a782 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-04-25 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ Fix more duplicate message prefixes.
+ * lib/Automake/XFile.pm (seek): Do not prepend $me.
+ ($me): Remove now-unused package-global.
+ * aclocal.in (check_acinclude): Remove duplicate 'warning: '
+ prefix.
+
Fix typo in manual.
* doc/automake.texi (Simple Tests using parallel-tests): Add
missing closing parenthesis.
diff --git a/aclocal.in b/aclocal.in
index 9622711a7..c229367ab 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -183,8 +183,7 @@ sub check_acinclude ()
foreach my $key (keys %map)
{
# FIXME: should print line number of acinclude.m4.
- msg ('syntax', "warning: macro `$key' defined in "
- . "acinclude.m4 but never used")
+ msg ('syntax', "macro `$key' defined in acinclude.m4 but never used")
if $map{$key} eq 'acinclude.m4' && ! exists $macro_seen{$key};
}
}
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index a7bb21958..67298f964 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -98,9 +98,6 @@ eval {
push (@EXPORT, @O);
};
-# Used in croak error messages.
-my $me = basename ($0);
-
=head2 Methods
=over
@@ -267,7 +264,7 @@ sub seek
if (!seek ($fh, $_[0], $_[1]))
{
my $file = $fh->name;
- fatal "$me: cannot rewind $file with @_: $!";
+ fatal "cannot rewind $file with @_: $!";
}
}