FYI: a couple of maint patches

[Ralf Wildenhues]

I've committed the result of 'make fetch':

    Sync auxiliary files from upstream.
    
    * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
    lib/texinfo.tex: Sync from upstream.

and the typo patch below, to the maint branch.  I've also fixed the
license headers of the cscope tests in master to not refer to GPLv3.

Cheers,
Ralf

    Doc and comment typos.
    
    * automake.in (handle_ltlibraries): Fix typo in comment.
    * tests/distcom7.test: Likewise.
    * tests/lisp5.test: Likewise.
    * doc/automake.texi (Usage of Conditionals): Fix typo.

diff --git a/automake.in b/automake.in
index bab8c42..e7f2cac 100755
--- a/automake.in
+++ b/automake.in
@@ -2839,7 +2839,7 @@ sub handle_ltlibraries
           my $ldir = '';
           $ldir = '/' . dirname ($val)
             if (!$strip_subdir);
-          # A library cannot be installed in different directory
+          # A library cannot be installed in different directories
           # in overlapping conditions.
           if (exists $instconds{$val})
             {
diff --git a/doc/automake.texi b/doc/automake.texi
index fbfe362..5cc5e51 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -9584,7 +9584,7 @@ Usage of Conditionals
 Conditionals may be nested to any depth.  You may specify an argument to
 @code{else} in which case it must be the negation of the condition used
 for the current @code{if}.  Similarly you may specify the condition
-that is closed by an @code{end}:
+that is closed on the @code{endif} line:
 
 @example
 if DEBUG
diff --git a/tests/distcom7.test b/tests/distcom7.test
index 557be44..500c909 100755
--- a/tests/distcom7.test
+++ b/tests/distcom7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2009  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
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test to make sure that Automake complains when an auxfile (here depcomp)
-# is installed, but the Makefile tht distributes it is not processed.
+# is installed, but the Makefile that distributes it is not processed.
 
 . ./defs || Exit 1
 
diff --git a/tests/lisp5.test b/tests/lisp5.test
index 3a44b43..e7b29e7 100755
--- a/tests/lisp5.test
+++ b/tests/lisp5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2007, 2009  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
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Automake; see the file COPYING.  If not, write to
 
-# Same as lisp4.test, but using the now-recommanded way to install
+# Same as lisp4.test, but using the now-recommended way to install
 # non-bytecompiled *.el files.
 
 required=emacs