automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

More minor message fixes.


From: Ralf Wildenhues
Subject: More minor message fixes.
Date: Sun, 6 Jun 2010 16:57:40 +0200
User-agent: Mutt/1.5.20 (2009-10-28)

This patch picks up a couple more obvious message fixes.
Committing to master.

Cheers,
Ralf

    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.

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;
     }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]