aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-08-11 09:34:23 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-08-20 03:56:37 +0300
commitd924eb591ebcfb603f8941763de9616ce4b1554c (patch)
tree5a56ec87297ffaf2ea01468055b0bbe21c4ddd62 /Makefile
parent8732265928818dd0b8797fb271e7c7fa9346d025 (diff)
downloadfirmware-d924eb591ebcfb603f8941763de9616ce4b1554c.tar.gz
firmware-d924eb591ebcfb603f8941763de9616ce4b1554c.tar.bz2
firmware-d924eb591ebcfb603f8941763de9616ce4b1554c.zip
Fix variable name clash with builtin
This caused the submake to be called several times, messing up the build.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3d4bd589f..319684c83 100644
--- a/Makefile
+++ b/Makefile
@@ -240,13 +240,13 @@ define PARSE_KEYMAP
KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM)
MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
- MAKE_COMMAND := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk
+ MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk
MAKE_MSG := Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR)
MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}'
COMMAND_true_$$(COMMAND) := \
printf "$$(MAKE_MSG)" | \
$$(MAKE_MSG_FORMAT); \
- LOG=$$$$($$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=true 2>&1) ; \
+ LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \
if [ $$$$? -gt 0 ]; \
then $$(PRINT_ERROR_PLAIN); \
elif [ "$$$$LOG" != "" ] ; \
@@ -257,7 +257,7 @@ define PARSE_KEYMAP
COMMAND_false_$$(COMMAND) := \
printf "$$(MAKE_MSG)\n" | \
$$(MAKE_MSG_FORMAT); \
- $$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=false;
+ $$(MAKE_CMD) $$(MAKE_VARS) SILENT=false;
endef
define PARSE_ALL_KEYMAPS