From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 20 May 2013 08:58:43 +0000 (+0200)
Subject: Merge branch 'micro' into maint
X-Git-Tag: v1.13b~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60bfe0b9af62baae3498fe8688703570ecb1a93e;p=platform%2Fupstream%2Fautomake.git

Merge branch 'micro' into maint

* micro:
  maintcheck: minor tweaks and fixlets

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

60bfe0b9af62baae3498fe8688703570ecb1a93e
diff --cc maintainer/syntax-checks.mk
index 5e1d71e,8808ae7..7e6391b
--- a/maintainer/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; \