]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Fix variable name clash with builtin
authorFred Sundvik <fsundvik@gmail.com>
Thu, 11 Aug 2016 06:34:23 +0000 (09:34 +0300)
committerFred Sundvik <fsundvik@gmail.com>
Sat, 20 Aug 2016 00:56:37 +0000 (03:56 +0300)
This caused the submake to be called several times, messing up the
build.

Makefile

index 3d4bd589f3e82e92c48a49dd6b86739ee166f6bd..319684c83ef32d9ffeb48d65cd2a8ed574dd923a 100644 (file)
--- 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