Merge branch 'micro' into maint

* micro:
  maintcheck: minor tweaks and fixlets

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index 5e1d71ee1..7e6391b40 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -214,8 +214,7 @@ sc_AMDEP_TRUE_in_automake_in:
 ## to $(MAKE), for portability to non-GNU make.
 sc_tests_make_without_am_makeflags:
 	@if grep '^[^#].*(MAKE) ' $(ams) $(automake_in) \
-	    | grep -v 'AM_MAKEFLAGS' \
-	    | grep -v '/am/header-vars\.am:.*am--echo.*| $$(MAKE) -f *-'; \
+	    | grep -Fv '$$(AM_MAKEFLAGS)'; \
 	then \
 	  echo 'Use $$(MAKE) $$(AM_MAKEFLAGS).' 1>&2; \
 	  exit 1; \
@@ -353,11 +352,11 @@ sc_tests_automake_fails:
 	  exit 1; \
 	fi
 
-## Setting 'required' after sourcing './defs' is a bug.
+## Setting 'required' after sourcing 'test-init.sh' is a bug.
 sc_tests_required_after_defs:
 	@for file in $(xtests); do \
-	  if out=`sed -n '/defs/,$${/required=/p;}' $$file`; test -n "$$out"; then \
-	    echo 'Do not set "required" after sourcing "defs" in '"$$file: $$out" 1>&2; \
+	  if out=`sed -n '/test-init\.sh/,$${/required=/p;}' $$file`; test -n "$$out"; then \
+	    echo 'Do not set "required" after sourcing "test-init.sh" in '"$$file: $$out" 1>&2; \
 	    exit 1; \
 	  fi; \
 	done
@@ -409,7 +408,7 @@ sc_tests_ls_t:
 	fi
 
 ## Never use 'sleep 1' to create files with different timestamps.
-## Use '$sleep' instead.  Some filesystems (e.g., Windows) have only
+## Use '$sleep' instead.  Some file systems (e.g., Windows) have only
 ## a 2sec resolution.
 sc_tests_plain_sleep:
 	@if grep -E '\bsleep +[12345]\b' $(xtests); then \