diff options
author | Donald Kjer <don.kjer@gmail.com> | 2021-06-19 15:30:23 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-19 15:30:23 -0700 |
commit | 1272ecd73c218e5827116aa68ce8ce6a4b6df4ec (patch) | |
tree | 38ebcec1c7fe11189dbc74d69b095cccd91a0b23 /build_json.mk | |
parent | 7c5ef4060e32396ddcbf0fd2ea9a22f569a4e984 (diff) |
Fixing incorrect keymap build when switching between multiple keymap.jsons (#12632)
Diffstat (limited to 'build_json.mk')
-rw-r--r-- | build_json.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build_json.mk b/build_json.mk index 8822be6a12..28659f2603 100644 --- a/build_json.mk +++ b/build_json.mk @@ -1,22 +1,22 @@ # Look for a json keymap file ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.json)","") - KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c + KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c KEYMAP_JSON := $(MAIN_KEYMAP_PATH_5)/keymap.json KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5) else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.json)","") - KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c + KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c KEYMAP_JSON := $(MAIN_KEYMAP_PATH_4)/keymap.json KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4) else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.json)","") - KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c + KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c KEYMAP_JSON := $(MAIN_KEYMAP_PATH_3)/keymap.json KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3) else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.json)","") - KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c + KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c KEYMAP_JSON := $(MAIN_KEYMAP_PATH_2)/keymap.json KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2) else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.json)","") - KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c + KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c KEYMAP_JSON := $(MAIN_KEYMAP_PATH_1)/keymap.json KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1) endif @@ -27,5 +27,5 @@ ifneq ("$(wildcard $(KEYMAP_PATH))", "") endif # Generate the keymap.c -$(KEYBOARD_OUTPUT)/src/keymap.c: $(KEYMAP_JSON) +$(KEYMAP_C): $(KEYMAP_JSON) $(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) |