* [PATCH] Makefile: fix MAKEFLAGS tests with multiple flags
@ 2015-09-05 13:32 john
2015-10-09 8:56 ` Jason
0 siblings, 1 reply; 2+ messages in thread
From: john @ 2015-09-05 13:32 UTC (permalink / raw)
findstring is defined as $(findstring FIND,IN) so if multiple flags are
set these tests do the wrong thing unless $(MAKEFLAGS) is the second
argument.
Signed-off-by: John Keeping <john at keeping.me.uk>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index a0a6615..fe9f001 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
QUIET_SUBDIR1 =
-ifneq ($(findstring $(MAKEFLAGS),w),w)
+ifneq ($(findstring w,$(MAKEFLAGS)),w)
PRINT_DIR = --no-print-directory
else # "make -w"
NO_SUBDIR = :
--
2.5.0.466.g9af26fa
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] Makefile: fix MAKEFLAGS tests with multiple flags
2015-09-05 13:32 [PATCH] Makefile: fix MAKEFLAGS tests with multiple flags john
@ 2015-10-09 8:56 ` Jason
0 siblings, 0 replies; 2+ messages in thread
From: Jason @ 2015-10-09 8:56 UTC (permalink / raw)
Merged, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-09 8:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-05 13:32 [PATCH] Makefile: fix MAKEFLAGS tests with multiple flags john
2015-10-09 8:56 ` Jason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).