From b84ee89d8785a71d77a35585b20d6e1801c6bcce Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Mon, 16 Apr 2018 18:50:51 -0700 Subject: [PATCH] Fix ECHO definition to not match variables in MAKEFLAGS by using MFLAGS instead. Prior ECHO definition strips T_A=XXX command line variable definitions from MAKEFLAGS but doesn't strip other variable definitions such as INSTALL_LOCATION. As a result, if you "make INSTALL_LOCATION=XXX" the ECHO definition erroneously matches if your install location contains 's'. Changing the ECHO definition to MFLAGS avoids all command line variable definitions. --- configure/CONFIG_COMMON | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index e6e60332b..43f4866d7 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -82,7 +82,7 @@ IOCS_APPL_TOP = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION)) #------------------------------------------------------- # Make echo output - suppress echoing if make's '-s' flag is set NOP = : -ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo) +ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo) #------------------------------------------------------- ifdef T_A