diff options
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -240,13 +240,13 @@ define PARSE_KEYMAP | |||
240 | KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) | 240 | KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) |
241 | MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) | 241 | MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) |
242 | MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) | 242 | MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) |
243 | MAKE_COMMAND := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk | 243 | MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk |
244 | MAKE_MSG := Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR) | 244 | MAKE_MSG := Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR) |
245 | MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}' | 245 | MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}' |
246 | COMMAND_true_$$(COMMAND) := \ | 246 | COMMAND_true_$$(COMMAND) := \ |
247 | printf "$$(MAKE_MSG)" | \ | 247 | printf "$$(MAKE_MSG)" | \ |
248 | $$(MAKE_MSG_FORMAT); \ | 248 | $$(MAKE_MSG_FORMAT); \ |
249 | LOG=$$$$($$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=true 2>&1) ; \ | 249 | LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \ |
250 | if [ $$$$? -gt 0 ]; \ | 250 | if [ $$$$? -gt 0 ]; \ |
251 | then $$(PRINT_ERROR_PLAIN); \ | 251 | then $$(PRINT_ERROR_PLAIN); \ |
252 | elif [ "$$$$LOG" != "" ] ; \ | 252 | elif [ "$$$$LOG" != "" ] ; \ |
@@ -257,7 +257,7 @@ define PARSE_KEYMAP | |||
257 | COMMAND_false_$$(COMMAND) := \ | 257 | COMMAND_false_$$(COMMAND) := \ |
258 | printf "$$(MAKE_MSG)\n" | \ | 258 | printf "$$(MAKE_MSG)\n" | \ |
259 | $$(MAKE_MSG_FORMAT); \ | 259 | $$(MAKE_MSG_FORMAT); \ |
260 | $$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=false; | 260 | $$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; |
261 | endef | 261 | endef |
262 | 262 | ||
263 | define PARSE_ALL_KEYMAPS | 263 | define PARSE_ALL_KEYMAPS |