From ce6dfb3b0e56e3f742adec8d40f94475066dc553 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 6 Jun 2010 16:55:08 +0200 Subject: [PATCH] More minor message fixes. * aclocal.in (scan_file): Fix recommended info command line. * automake.in (handle_lib_objects): No need to prepend function name to prog_error message. (handle_tags): Add missing word and missing space in error message. (handle_dist): Add missing closing single quote in message. Line-wrap one long message for readability. Signed-off-by: Ralf Wildenhues --- ChangeLog | 11 +++++++++++ aclocal.in | 2 +- automake.in | 12 ++++++------ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f94715..b231fe4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-06-06 Ralf Wildenhues + + More minor message fixes. + * aclocal.in (scan_file): Fix recommended info command line. + * automake.in (handle_lib_objects): No need to prepend function + name to prog_error message. + (handle_tags): Add missing word and missing space in error + message. + (handle_dist): Add missing closing single quote in message. + Line-wrap one long message for readability. + 2010-06-06 Stefano Lattarini Ralf Wildenhues diff --git a/aclocal.in b/aclocal.in index 06d69ed..182e4f7 100644 --- a/aclocal.in +++ b/aclocal.in @@ -559,7 +559,7 @@ sub scan_file ($$$) if (! defined $1) { msg ('syntax', "$file:$.", "underquoted definition of $2" - . "\n run info '(automake)Extending aclocal'\n" + . "\n run info Automake 'Extending aclocal'\n" . " or see http://sources.redhat.com/automake/" . "automake.html#Extending-aclocal") unless $underquoted_manual_once; diff --git a/automake.in b/automake.in index 05b8711..be336a1 100644 --- a/automake.in +++ b/automake.in @@ -2317,9 +2317,9 @@ sub handle_lib_objects my ($xname, $varname) = @_; my $var = var ($varname); - prog_error "handle_lib_objects: `$varname' undefined" + prog_error "`$varname' undefined" unless $var; - prog_error "handle_lib_objects: unexpected variable name `$varname'" + prog_error "unexpected variable name `$varname'" unless $varname =~ /^(.*)(?:LIB|LD)ADD$/; my $prefix = $1 || 'AM_'; @@ -2352,7 +2352,7 @@ sub handle_lib_objects # FIXME: should display a stack of nested variables # as context when $var != $subvar. err_var ($var, "linker flags such as `$val' belong in " - . "`${prefix}LDFLAGS"); + . "`${prefix}LDFLAGS'"); } return (); } @@ -3822,8 +3822,8 @@ sub handle_tags set_seen 'TAGS_DEPENDENCIES'; } elsif (reject_var ('TAGS_DEPENDENCIES', - "doesn't make sense to define `TAGS_DEPENDENCIES'" - . "without\nsources or `ETAGS_ARGS'")) + "it doesn't make sense to define `TAGS_DEPENDENCIES'" + . " without\nsources or `ETAGS_ARGS'")) { } else @@ -3946,7 +3946,7 @@ sub handle_dist () $archive_defined ||= grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip lzma xz); error (option 'no-dist-gzip', - "no-dist-gzip specified but no dist-* specified, " + "no-dist-gzip specified but no dist-* specified,\n" . "at least one archive format must be enabled") unless $archive_defined; } -- 2.7.4