summaryrefslogtreecommitdiff
path: root/build_keyboard.mk
diff options
context:
space:
mode:
authorWillyPillow <WillyPillow@users.noreply.github.com>2018-05-23 03:47:28 +0800
committerDrashna Jaelre <drashna@live.com>2018-05-22 12:47:28 -0700
commit508801c948b0d4a8b7ea727ce5c3a6ab393d7dc6 (patch)
tree358f3b3ed49f698d0f361e40635a7e4db0583d8a /build_keyboard.mk
parent7658f10fba71974bdd6dfc33fbd53deff76b1f83 (diff)
downloadqmk_firmware-508801c948b0d4a8b7ea727ce5c3a6ab393d7dc6.tar.gz
qmk_firmware-508801c948b0d4a8b7ea727ce5c3a6ab393d7dc6.zip
Import userspace config.h according to USER_NAME (#2983)
* Import userspace config.h according to USER_NAME * Use USER_PATH instead of directly using USER_NAME
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