From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 23 Dec 2014 01:19:36 +0000 (+0100)
Subject: Merge branch 'fix-dryrun-detection' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2adc128922ae37991d97826ad09ea6079f9a83f8;p=thirdparty%2Fautomake.git

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
---

2adc128922ae37991d97826ad09ea6079f9a83f8
diff --cc lib/am/header-vars.mk
index 58446da39,4cea4aa27..4361f4ef5
--- a/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 1d6fe7478,dee8fc6d4..9394bbbcd
mode 100644,100755..100644
--- a/t/make-dryrun.tap
+++ b/t/make-dryrun.tap