Merge branch 'micro' into maint

* micro:
  maintcheck: minor tweaks and fixlets

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

diff --cc maintainer/syntax-checks.mk
index 5e1d71e,8808ae7..7e6391b
--- 1/maintainer/syntax-checks.mk
--- 2/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@@ -213,9 -206,8 +213,8 @@@ sc_AMDEP_TRUE_in_automake_in
  ## Recursive make invocations should always pass $(AM_MAKEFLAGS)
  ## to $(MAKE), for portability to non-GNU make.
  sc_tests_make_without_am_makeflags:
 -      @if grep '^[^#].*(MAKE) ' $(ams) $(srcdir)/automake.in \
 +      @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; \