* doc/automake.texi, lib/Automake/Rule.pm: Fix some typos.

* NEWS: Likewise.  Clarify that only one LIBOBJDIR is supported.

diff --git a/ChangeLog b/ChangeLog
index 1bd4598178b2e8d9bfee1821a30a3394bea2271a..a8279b4526a574fdeb4da4d56949f2cd907d61c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * doc/automake.texi, lib/Automake/Rule.pm: Fix some typos.
+       * NEWS: Likewise.  Clarify that only one LIBOBJDIR is supported.
+
 2006-08-23  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/Automake/ChannelDefs.pm (usage): Mention that -Wportability

diff --git a/NEWS b/NEWS
index b9a069bc4488d0df0b614b0f86941b4de37032b9..e4cb2db43f587f3c7c922a8ef4a2e5b1cb9aabcb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ New in 1.9b:
   - `dirlist' entries (for the aclocal search path) may use shell
     wildcards such as `*', `?', or `[...]'.
 
-  - aclocal supports an --install option, that will cause system-wide
+  - aclocal supports an --install option that will cause system-wide
     third-party macros to be installed in the local directory
     specified with the first -I flag.  This option also uses #serial
     lines in M4 files to upgrade local macros.
@@ -41,7 +41,8 @@ New in 1.9b:
 
   - If `subdir-objects' is set, and AC_CONFIG_LIBOBJ_DIR is specified,
     $(LIBOBJS), $(LTLIBOBJS), $(ALLOCA), and $(LTALLOCA) can be used
-    in different directories.
+    in different directories.  However, only one instance of such a
+    library objects directory is supported.
 
 * Change to Libtool support:
 
@@ -55,11 +56,11 @@ New in 1.9b:
     is not enabled.
 
   - ylwrap is now always used for lex and yacc source files,
-    regardless of whether there is more than one source per-directory.
+    regardless of whether there is more than one source per directory.
 
 * Languages changes:
 
-  - Preprocessed assembler (*.S) compilation now honnors CPPFLAGS,
+  - Preprocessed assembler (*.S) compilation now honors CPPFLAGS,
     AM_CPPFLAGS and per-target _CPPFLAGS, and supports dependency
     tracking, unlike non-preprocessed assembler (*.s).
 
@@ -128,7 +129,7 @@ New in 1.9b:
 
   - clean, distribution, or rebuild rules are normally disabled for
     inputs and outputs of AC_CONFIG_FILES, AC_CONFIG_HEADERS, and
-    AC_CONFIG_LINK specified using shell variable.  However if these
+    AC_CONFIG_LINK specified using shell variables.  However, if these
     variables are used as ${VAR}, and AC_SUBSTed, then Automake will
     be able to output rules anyway.
     (See the Automake documentation for AC_CONFIG_FILES.)
@@ -138,7 +139,7 @@ New in 1.9b:
     This is mostly useful when some check_PROGRAMS are listed in TESTS.
 
   - `-Wportability' has finally been turned on by default for `gnu' and
-    `gnits' strictness.  This means automake will complain about %-rules
+    `gnits' strictness.  This means, automake will complain about %-rules
     or $(GNU Make functions) unless you switch to `foreign' strictness or
     use `-Wno-portability'.
 

diff --git a/doc/automake.texi b/doc/automake.texi
index 28d08c068358b3f3b39ef7e33eaf4b06b4792724..64906dc7e6751461bdb7e74c6cd12494be3110f3 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3896,7 +3896,7 @@ use Autoconf's @code{AC_HEADER_TIOCGWINSZ} instead.
 @vindex mkdir_p
 
 From Automake 1.8 to 1.9.6 this macro used to define the output
-variable @code{mkdir_p} to one of @code{mkdir -p}, @code{install.sh
+variable @code{mkdir_p} to one of @code{mkdir -p}, @code{install-sh
 -d}, or @code{mkinstalldirs}.
 
 Nowadays Autoconf provides a similar functionality with

diff --git a/doc/stamp-vti b/doc/stamp-vti
index c1b2e87992788c9f152f58b34ce8668b8f3e3ba9..560ec26bc4e6547dae1227edd5042a17012a76f3 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 22 August 2006
+@set UPDATED 28 August 2006
 @set UPDATED-MONTH August 2006
 @set EDITION 1.9c
 @set VERSION 1.9c

diff --git a/doc/version.texi b/doc/version.texi
index c1b2e87992788c9f152f58b34ce8668b8f3e3ba9..560ec26bc4e6547dae1227edd5042a17012a76f3 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 22 August 2006
+@set UPDATED 28 August 2006
 @set UPDATED-MONTH August 2006
 @set EDITION 1.9c
 @set VERSION 1.9c

diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index f996346f40cdf65e98e995af6666fcfea6d571df..59f9dda8c99506e0fcab3473c0e8d5844cd90dc1 100644 (file)
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006  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
@@ -631,7 +631,7 @@ sub define ($$$$$)
              if ($target !~ /^[^%]*%[^%]*$/)
                {
                  ## FIXME: Presently we can't diagnose duplicate user rules
-                 ## because we doesn't distinguish rules with commands
+                 ## because we don't distinguish rules with commands
                  ## from rules that only add dependencies.  E.g.,
                  ##   .PHONY: foo
                  ##   .PHONY: bar