diff options
| author | Zach White <skullydazed@gmail.com> | 2021-03-18 16:10:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 16:10:40 -0700 |
| commit | f2715a05939b749771d9826f9ad23b4cab280e82 (patch) | |
| tree | 90a776e94206f0f18be3b3399b7d72ca2ec01897 /Makefile | |
| parent | 90b1e271a8178d68e8c1be0beecfb26b42767f5f (diff) | |
| download | qmk_firmware-f2715a05939b749771d9826f9ad23b4cab280e82.tar.gz qmk_firmware-f2715a05939b749771d9826f9ad23b4cab280e82.zip | |
Consistently use bin/qmk when that script is called (#12286)
* Pass QMK_BIN down to build_keyboard.mk
* choose the correct qmk script
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -30,7 +30,7 @@ endif | |||
| 30 | endif | 30 | endif |
| 31 | 31 | ||
| 32 | # Determine which qmk cli to use | 32 | # Determine which qmk cli to use |
| 33 | ifeq (, $(shell which qmk)) | 33 | ifeq (,$(shell which qmk)) |
| 34 | QMK_BIN = bin/qmk | 34 | QMK_BIN = bin/qmk |
| 35 | else | 35 | else |
| 36 | QMK_BIN = qmk | 36 | QMK_BIN = qmk |
| @@ -391,7 +391,7 @@ define PARSE_KEYMAP | |||
| 391 | # Format it in bold | 391 | # Format it in bold |
| 392 | KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) | 392 | KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) |
| 393 | # Specify the variables that we are passing forward to submake | 393 | # Specify the variables that we are passing forward to submake |
| 394 | MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) | 394 | MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) QMK_BIN=$$(QMK_BIN) |
| 395 | # And the first part of the make command | 395 | # And the first part of the make command |
| 396 | MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET) | 396 | MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET) |
| 397 | # The message to display | 397 | # The message to display |