Merge branch 'master' into ng/master

* master:
  readme: update and renew
  depcomp tests: fix up today's botched commit
  build: clearer diagnostic if "make" is invoked before "./configure"
  depcomp tests: put TAP plan in generated tests
  update-copyright: don't touch COPYING and INSTALL
  maintcheck: whitelist some false positives

+ Extra diffs:

* syntax-checks.mk: Throw away changes to the obsolete check
'sc_tests_overriding_macros_on_cmdline'.

8 files changed, 47 insertions, 43 deletions

diff --git a/COPYING b/COPYING
index a9a3ea029..d511905c1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989-2012 Free Software Foundation, Inc.,
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
diff --git a/GNUmakefile b/GNUmakefile
index 134e74323..9d83dbaa3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -15,5 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include ./Makefile
-include $(srcdir)/syntax-checks.mk
+# If the user runs GNU make but has not yet run ./configure,
+# give them an helpful diagnostic instead of a cryptic error.
+am--Makefile := $(wildcard Makefile)
+ifeq ($(am--Makefile),)
+  $(warning There seems to be no Makefile in this directory.)
+  $(warning You must run ./configure before running 'make'.)
+  $(error Fatal Error)
+else
+  include ./Makefile
+  include $(srcdir)/syntax-checks.mk
+endif
diff --git a/INSTALL b/INSTALL
index 414d0e5dd..a1e89e18a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-2012 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/Makefile.am b/Makefile.am
index 44d73c283..2befc9197 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -379,6 +379,6 @@ update-copyright:
 	$(AM_V_GEN)excluded_re=`echo $(FETCHFILES) \
 	  | sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \
 	$(GIT) ls-files \
-	  | grep -Ev '/(COPYING|INSTALL)' \
+	  | grep -Ev '^(lib/)?(COPYING|INSTALL)$$' \
 	  | grep -Ev "^($$excluded_re)$$" \
 	  | $(update_copyright_env) xargs $(srcdir)/lib/$@
diff --git a/README b/README
index 3c46c77b5..08ce966aa 100644
--- a/README
+++ b/README
@@ -92,38 +92,35 @@ in "it hasn't taken place on any list, neither public nor non-public"):
 
 ===========================================================================
 
-This is Automake, a Makefile generator.  It was inspired by the 4.4BSD
-make and include files, but it only targets GNU make, and it aims to
+This is Automake, a Makefile generator.  It targets GNU make, and aims to
 conform to the GNU Coding Standards for Makefile variables and targets.
 
+See the INSTALL file for detailed information about how to configure
+and install Automake.
+
 Automake is a Perl script.  The input files are called Makefile.am.
 The output files are called Makefile.in; they are intended for use
 with Autoconf.  Automake requires certain things to be done in your
 configure.ac.
 
-Variable assignment lines in Makefile.am pull in defaults from various
-little *.am files.
-
-To use Automake, replace your Makefile.in files with Makefile.am
-files.  Read the documentation to see what to do.
-
-This package also includes the "aclocal" program.  aclocal is a
-program to generate an `aclocal.m4' based on the contents of
-`configure.ac'.  It is useful as an extensible, maintainable mechanism
-for augmenting autoconf.  It is intended that other package authors
-will write m4 macros which can be automatically used by aclocal.
-
-Automake has a test suite.  Use
+Automake comes with extensive documentation; please refer to it for
+more details about its purpose, features, and usage patterns.
 
-	make check
+This package also includes the "aclocal" program, whose purpose is
+to generate an 'aclocal.m4' based on the contents of 'configure.ac'.
+It is useful as an extensible, maintainable mechanism for augmenting
+autoconf.  It is intended that other package authors will write m4
+macros which can be automatically used by aclocal.  The documentation
+for aclocal is currently found in the Automake manual.
 
-to run it.  For more information, see the file tests/README.
+Automake has a test suite.  Use "make check" to run it.  For more
+information, see the file tests/README.
 
 Automake has a page on the web.  See:
 
 	http://www.gnu.org/software/automake/
 
-Automake also has three mailing lists:
+Automake has also three mailing lists:
 
   * automake@gnu.org
     For general discussions of Automake and its interactions with other
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 1b5e08cc6..e3e07096d 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -214,7 +214,7 @@ sc_no_for_variable_in_macro:
 sc_mkinstalldirs:
 	@if grep -n 'mkinstalldirs' $(ams) \
 	      | grep -F -v '$$(mkinstalldirs)' \
-	      | grep -v '^\./lib/Makefile.am:37:  *mkinstalldirs \\$$'; \
+	      | grep -v '^\./lib/Makefile.am:[0-9][0-9]*:  *mkinstalldirs \\$$'; \
 	then \
 	  echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
 	  exit 1; \
diff --git a/tests/depcomp.sh b/tests/depcomp.sh
index d14928048..d204058c9 100755
--- a/tests/depcomp.sh
+++ b/tests/depcomp.sh
@@ -67,8 +67,7 @@
 
 # -------------------------------------------------------------------------
 
-am_create_testdir=empty
-. ./defs || Exit 1
+# This expects ./defs has already been included has already been included..
 
 ocwd=`pwd` || fatal_ "cannot get current working directory"
 longpath=this-is/a-path/which-has/quite-a/definitely/truly/long_long_name
@@ -286,30 +285,25 @@ test -f build-aux/depcomp \
 # selected by '--enable-dependency-tracking', we make this threefold check
 # only in this later case.
 
+if test $depmode,$depcomp_with_libtool = auto,yes; then
+  do_all_tests ()
+  {
+    do_test default
+    do_test noshared --disable-shared
+    do_test nostatic --disable-static
+  }
+else
+  do_all_tests () { do_test; }
+fi
+
 case $depmode in
   auto)
-    if test $depcomp_with_libtool = no; then
-      plan_ 28
-      do_all_tests () { do_test; }
-    else
-      plan_ 84
-      do_all_tests ()
-      {
-        do_test default
-        do_test noshared --disable-shared
-        do_test nostatic --disable-static
-      }
-    fi
     displayed_depmode='..*' # At least one character long.
     cfg_deptrack=--enable-dependency-tracking ;;
   disabled)
-    plan_ 28
-    do_all_tests () { do_test; }
     displayed_depmode=none
     cfg_deptrack=--disable-dependency-tracking ;;
   *)
-    plan_ 28
-    do_all_tests () { do_test; }
     displayed_depmode="(cached) $depmode"
     cfg_deptrack="$cachevar=$depmode"
     # Sanity check: ensure the cache variable we force is truly
diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part
index bafb1138d..ebf28e2bf 100755
--- a/tests/gen-testsuite-part
+++ b/tests/gen-testsuite-part
@@ -346,6 +346,7 @@ foreach my $lt (TRUE, FALSE)
   {
     foreach my $m (keys %depmodes)
       {
+        my $planned = ($lt && $m eq "auto") ? 84 : 28;
         my @required =
           (
             @{$depmodes{$m}},
@@ -353,6 +354,7 @@ foreach my $lt (TRUE, FALSE)
           );
         my @vars_init =
           (
+            "am_create_testdir=empty",
             "depmode=$m",
             "depcomp_with_libtool=" . ($lt ? "yes" : "no"),
           );
@@ -367,7 +369,8 @@ foreach my $lt (TRUE, FALSE)
               # Automatically generated test.  DO NOT EDIT BY HAND!
               @vars_init
               required="@required"
-              . ./defs-static || exit '99'
+              . ./defs || Exit 1
+              plan_ $planned
               . "\$testsrcdir/depcomp.sh"; exit "\$?"
 EOF
           },