Merge branch 'fix-dryrun-detection' into ng/master

* fix-dryrun-detection:
  make flags analysis: fix bug in $(MFLAGS) parsing (typo-induced)
  make flags analysis: expose bug in dry-run recognition

diff --cc lib/am/header-vars.mk
index 58446da3939007d8db282d38bfdc2ac60eeb318a,4cea4aa27080db3eebe337639c23b355d4cc3817..4361f4ef51ff02fc647fc4aa88b3572975a55b2b
--- 1/lib/am/header-vars.mk
--- 2/lib/am/header-vars.mk
+++ b/lib/am/header-vars.mk
@@@ -171,14 -171,14 +171,14 @@@ DESTDIR ?
  # optional (e.g., '-O').  This *vastly* simplifies the implementation
  # of this macro.
  am.make.is-running-with-option = \
-   $(if $(findstring $(strip $1),filter-out --%,$(MFLAGS)),true,false)
+   $(if $(findstring $(strip $1),$(filter-out --%,$(MFLAGS))),true,false)
  
 -# Tell whether make is running in "dry mode".
 +# Tell whether make is running in dry mode ("make -n") or not.
  am.make.dry-run := $(call am.make.is-running-with-option, n)
  
 -# Shell code that determines whether make is running in "keep-going mode"
 -# ("make -k") or not.  Useful in rules that must recursively descend into
 -# subdirectories, and decide whether to stop at the first error or not.
 +# Tell whether make is running in "keep-going mode" ("make -k") or not.
 +# Useful in rules that must recursively descend into subdirectories,
 +# and decide whether to stop at the first error or not.
  am.make.keep-going := $(call am.make.is-running-with-option, k)
  
  am.util.strip-first-word = $(wordlist 2,$(words $(1)),$(1))

diff --cc t/make-dryrun.tap
index 1d6fe7478d076b5057618f79d0cbbd391652db65,dee8fc6d4ac9cc2b4390e6322736ea3883ee9f97..9394bbbcddf0db6904ebeff50b14c55ab4e83432
mode 100644,100755..100644
--- 1/t/make-dryrun.tap
--- 2/t/make-dryrun.tap
+++ b/t/make-dryrun.tap