diff options
Diffstat (limited to 'lib/Automake')
| -rw-r--r-- | lib/Automake/ChannelDefs.pm | 2 | ||||
| -rw-r--r-- | lib/Automake/Channels.pm | 2 | ||||
| -rw-r--r-- | lib/Automake/Configure_ac.pm | 5 | ||||
| -rw-r--r-- | lib/Automake/Options.pm | 2 | ||||
| -rw-r--r-- | lib/Automake/Rule.pm | 7 | ||||
| -rw-r--r-- | lib/Automake/Variable.pm | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm index 26ef575f8..acb3ae8a0 100644 --- a/lib/Automake/ChannelDefs.pm +++ b/lib/Automake/ChannelDefs.pm @@ -369,7 +369,7 @@ sub set_strictness ($) } else { - prog_error "level `$name' not recognized\n"; + prog_error "level `$name' not recognized"; } } diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm index 1fb2f53ac..aeed4db66 100644 --- a/lib/Automake/Channels.pm +++ b/lib/Automake/Channels.pm @@ -680,7 +680,7 @@ Override the options of C<$channel> with those specified by C<%options>. sub setup_channel ($%) { my ($name, %opts) = @_; - confess "channel $name doesn't exist" unless exists $channels{$name}; + confess "unknown channel $name" unless exists $channels{$name}; _merge_options %{$channels{$name}}, %opts; } diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm index d5ad9776e..4f0e445a1 100644 --- a/lib/Automake/Configure_ac.pm +++ b/lib/Automake/Configure_ac.pm @@ -1,4 +1,5 @@ -# Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc. +# Copyright (C) 2003, 2005, 2006, 2009, 2010 Free Software Foundation, +# Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -80,7 +81,7 @@ sub find_configure_ac (;@) { msg ('unsupported', "`$configure_ac' and `$configure_in' both present.\n" - . "proceeding with `$configure_ac'."); + . "proceeding with `$configure_ac'"); } return $configure_ac } diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index 0c388386d..a6d65a8eb 100644 --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@ -369,7 +369,7 @@ sub set_strictness ($) } else { - prog_error "level `$strictness_name' not recognized\n"; + prog_error "level `$strictness_name' not recognized"; } } diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm index ad63cc57e..d9d9ae026 100644 --- a/lib/Automake/Rule.pm +++ b/lib/Automake/Rule.pm @@ -1,5 +1,4 @@ -# Copyright (C) 2003, 2004, 2006, 2007, 2010 Free Software Foundation, -# Inc. +# Copyright (C) 2003, 2004, 2006, 2007, 2010 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -727,7 +726,7 @@ sub define ($$$$$) } } # Never reached. - prog_error ("Unreachable place reached."); + prog_error ("unreachable place reached"); } # Conditions for which the rule should be defined. @@ -819,7 +818,7 @@ sub define ($$$$$) # definitions of multiple inference rules. It's also # disallowed to mix plain targets with inference rules. msg ('portability', $where, - "Inference rules can have only one target before the colon (POSIX).") + "inference rules can have only one target before the colon (POSIX)") if $inference_rule_count > 0 && $target_count > 1; return @conds; diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index af0515ef4..f75ec10b7 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -884,7 +884,7 @@ sub define ($$$$$$$$) . $def->type . "=' here ...", partial => 1); error ($where, "... and is now set with `$type=' here."); prog_error ("Automake variable assignments should be consistently\n" - . "defined with the same sign."); + . "defined with the same sign"); } # If Automake tries to override a value specified by the user, @@ -1078,7 +1078,7 @@ For debugging. sub variables_dump () { - my $text = "All variables:\n{\n"; + my $text = "all variables:\n{\n"; foreach my $var (sort { $a->name cmp $b->name } variables) { $text .= $var->dump; |