# HG changeset patch # User Ray Donnelly # Date 1373456421 -3600 # Node ID 58ca31386bfbb48a522724dca79040efd54041c3 # Parent 56db5f3f2c8c2281bbf27f6eec59bde908bf36b8 Allow reordered MAKEFLAGS -R and -r (-Rr) can be reordered to -r and -R (-rR). This happens with MSYS1/2 gnu-make and mingw32-make, and triggers "Recursion detected, bailing out..." Signed-off-by: Ray Donnelly Message-Id: Patchwork-Id: 258027 diff -r 56db5f3f2c8c -r 58ca31386bfb Makefile.in --- a/Makefile.in Fri Jun 28 22:35:06 2013 +0200 +++ b/Makefile.in Wed Jul 10 12:40:21 2013 +0100 @@ -24,9 +24,14 @@ # Note: dual test, because if -R and -r are given on the command line # (who knows?), MAKEFLAGS contains 'Rr' instead of '-Rr', while adding # '-Rr' to MAKEFLAGS adds it literaly ( and does not add 'Rr' ) +# Further: quad test because the flags 'rR' and '-rR' can be reordered. ifeq ($(filter Rr,$(MAKEFLAGS)),) ifeq ($(filter -Rr,$(MAKEFLAGS)),) +ifeq ($(filter rR,$(MAKEFLAGS)),) +ifeq ($(filter -rR,$(MAKEFLAGS)),) CT_MAKEFLAGS += -Rr +endif # No -rR +endif # No rR endif # No -Rr endif # No Rr