summaryrefslogtreecommitdiffstats
path: root/build_keyboard.mk
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2018-06-12 10:59:35 -0400
committerJack Humbert <jack.humb@gmail.com>2018-06-12 10:59:35 -0400
commit998ddbb122c9d3e2a77bd4e88c881b225ca0d569 (patch)
treeca91ff7ad3c4866555d1e623fe9ea05276397e1c /build_keyboard.mk
parentc0095710a7c7e9bd94aa9f4dd814dc28d718c731 (diff)
parent06487daaddf923d635e8a528d1eb644b875a73f6 (diff)
Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r--build_keyboard.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 4781f4a5d1..b25712385c 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -210,8 +210,8 @@ endif
USER_PATH := users/$(USER_NAME)
-include $(USER_PATH)/rules.mk
-ifneq ("$(wildcard users/$(KEYMAP)/config.h)","")
- CONFIG_H += users/$(KEYMAP)/config.h
+ifneq ("$(wildcard $(USER_PATH)/config.h)","")
+ CONFIG_H += $(USER_PATH)/config.h
endif