test harness: improve catching of usage errors in script 'test-driver'

[platform/upstream/automake.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 7ab58ca..52c2002 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,6 @@
 # Maintainer makefile for Automake.  Requires GNU make.
 
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2013 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
@@ -25,7 +25,8 @@ ifeq ($(wildcard Makefile),)
   $(error Fatal Error)
 endif
 include ./Makefile
-include $(srcdir)/syntax-checks.mk
+include $(srcdir)/maintainer/maint.mk
+include $(srcdir)/maintainer/syntax-checks.mk
 
 else # ! bootstrap in $(MAKECMDGOALS)
 
@@ -49,7 +50,7 @@ export BOOTSTRAP_SHELL
 #      kick in, because the tree might be in an inconsistent state (e.g.,
 #      we have just switched from 'maint' to 'master', and have the built
 #      'automake' script left from 'maint', but the files 'lib/am/*.am'
-#      are from 'master': if 'automake' gets run and used those files --
+#      are from 'master': if 'automake' gets run and uses those files --
 #      boom!).
 
 ifdef config-status # Bootstrap from an already-configured tree.