* doc/automake.texi (Program and Library Variables): Typo.

* lib/Automake/Variable.pm (transform_variable_recursively): Typo
in a comment.

diff --git a/ChangeLog b/ChangeLog
index b3694d2ce167c26cb798801d444f85be6e949dcc..2799b40b63fc432c830f09a24446c16354168e77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-17  Stepan Kasal  <kasal@ucw.cz>
+
+       * doc/automake.texi (Program and Library Variables): Typo.
+       * lib/Automake/Variable.pm (transform_variable_recursively): Typo
+       in a comment.
+
 2005-10-03  Stepan Kasal  <kasal@ucw.cz>
 
        * ChangeLog.03, automake.in, tests/overrid.test: Typos.

diff --git a/doc/automake.texi b/doc/automake.texi
index 29ce995a17918650a6c2e4b2ab64145b2aaf94b0..1de9581740f1649a482c9c61908b2678c38cafc7 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4051,7 +4051,7 @@ In the case of libtool libraries, @code{maude_LIBADD} can also refer
 to other libtool libraries.
 
 @item maude_LDADD
-Extra objects (@file{*.$(OBJDIR)}) and libraries (@file{*.a},
+Extra objects (@file{*.$(OBJEXT)}) and libraries (@file{*.a},
 @file{*.la}) can be added to a @emph{program} by listing them in the
 @code{_LDADD} variable.  For instance, this should be used for objects
 determined by @command{configure} (@pxref{Linking}).

diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 1befbd0d9045da6905e423e899ede72598dc68ca..059456c4847bd2954f43dd97fe69a3c585c66473 100644 (file)
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -1551,7 +1551,7 @@ sub transform_variable_recursively ($$$$$&;%)
 
   my $res = $var->traverse_recursively
     ($fun_item,
-     # The code that define the variable holding the result
+     # The code that defines the variable holding the result
      # of the recursive transformation of a subvariable.
      sub {
        my ($subvar, $parent_cond, @allresults) = @_;