typos in comments

diff --git a/ChangeLog b/ChangeLog
index 216c2cec0ca0715a5caead9b795d33013aac1489..c80fe4ef60b9986d0e93fa19b53e46bcc81c85b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-12  Raja R Harinath  <harinath@acm.org>
+
+       * lib/Automake/DisjConditions.pm (ambiguous_p): Typo in comment.
+       * lib/Automake/Rule.pm (accept_extensions, msg_cond_rule): Likewise.
+       (define): Reword comment slightly.
+       * Variable.pm (_var_order, msg_cond_var): Typo in comment.
+       * tests/cond20.test (var2): Use foo.c instead of foo.cc to avoid
+       spurious automake error exit.
+       
 2003-08-12  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/Automake/Item.pm, lib/Automake/ItemDef.pm: New files.

diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index ae183314b91a3c2ce9396afec86e63d1d0715421..e5743f5518792d7b827f476883dc96edae26f7f5 100644 (file)
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -458,7 +458,7 @@ sub ambiguous_p ($$$)
 {
   my ($self, $var, $cond) = @_;
 
-  # Note that these rules doesn't consider the following
+  # Note that these rules don't consider the following
   # example as ambiguous.
   #
   #   if COND1

diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 35fc11d540f257e3a41962d3f08864436576237f..4bef2b4cb869aba570f64c2e970d02f3da229503 100644 (file)
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -128,7 +128,7 @@ use vars '%actions';
 =item <$suffix_rules>
 
 This maps the source extension for all suffix rule seen to
-a C<\hash> whose keys are the possible output extensions.
+a C<hash> whose keys are the possible output extensions.
 
 Note that this is transitively closed by construction:
 if we have
@@ -162,7 +162,7 @@ by the languages supported by Automake).  Using this pattern (instead
 of `\..*$') to match extensions allows Automake to support dot-less
 extensions.
 
-New extension should be registered with C<accept_extensions>.
+New extensions should be registered with C<accept_extensions>.
 
 =cut
 
@@ -218,7 +218,7 @@ sub msg_cond_rule ($$$$;%)
 
 Messages about rules.
 
-=cute
+=cut
 
 sub msg_rule ($$$;%)
 {
@@ -774,8 +774,8 @@ sub define ($$$$$)
   for my $t (split (' ', $target))
     {
       ++$target_count;
-      # Check the rule for being a suffix rule. If so, store in a hash.
-      # Either it's a rule for two known extensions...
+      # Check if the rule is a suffix rule: either it's a rule for
+      # two known extensions...
       if ($t =~ /^($KNOWN_EXTENSIONS_PATTERN)($KNOWN_EXTENSIONS_PATTERN)$/
          # ...or it's a rule with unknown extensions (.i.e, the rule
          # looks like `.foo.bar:' but `.foo' or `.bar' are not

diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index cd716c701bcbba8d4642250367bc71164fda57bc..f993ca5a1dba6e26dc4e914e76254acf477a3142 100644 (file)
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -133,7 +133,7 @@ non-object).
 my $_VARIABLE_PATTERN = '^[.A-Za-z0-9_@]+' . "\$";
 
 # The order in which variables should be output.  (May contain
-# duplicates -- only the first occurence matters.)
+# duplicates -- only the first occurrence matters.)
 my @_var_order;
 
 # This keeps track of all variables defined by &_gen_varname.
@@ -229,7 +229,7 @@ sub msg_cond_var ($$$$;%)
 
 =item C<msg_var ($channel, $var, $message, [%options])>
 
-messages about variables.
+Messages about variables.
 
 =cut
 

diff --git a/tests/cond20.test b/tests/cond20.test
index e56fbea0550365d700ad4cbdb5e11cf01acd04d2..7d3ec0636c6b8b0569ddfac35996f7065e398d3a 100755 (executable)
--- a/tests/cond20.test
+++ b/tests/cond20.test
@@ -36,7 +36,7 @@ cat > Makefile.am << 'END'
 var1 = $(var2)
 
 if COND1
-var2 = $(var1:=.c) foo.cc
+var2 = $(var1:=.c) foo.c
 else
 var2 = $(var1:=.c)
 endif