summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builddefs/build_keyboard.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index afad67a76d..7d58c29462 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -197,8 +197,10 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
197 KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c 197 KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
198 KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h 198 KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h
199 199
200 # Load the keymap-level rules.mk if exists 200 ifeq ($(OTHER_KEYMAP_C),)
201 -include $(KEYMAP_PATH)/rules.mk 201 # Load the keymap-level rules.mk if exists (and we havent already loaded it for keymap.c)
202 -include $(KEYMAP_PATH)/rules.mk
203 endif
202 204
203 # Load any rules.mk content from keymap.json 205 # Load any rules.mk content from keymap.json
204 INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON)) 206 INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))