diff options
| author | WillyPillow <WillyPillow@users.noreply.github.com> | 2018-05-23 03:47:28 +0800 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-05-22 12:47:28 -0700 |
| commit | 508801c948b0d4a8b7ea727ce5c3a6ab393d7dc6 (patch) | |
| tree | 358f3b3ed49f698d0f361e40635a7e4db0583d8a /build_keyboard.mk | |
| parent | 7658f10fba71974bdd6dfc33fbd53deff76b1f83 (diff) | |
| download | qmk_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.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index 4781f4a5d..b25712385 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
| @@ -210,8 +210,8 @@ endif | |||
| 210 | USER_PATH := users/$(USER_NAME) | 210 | USER_PATH := users/$(USER_NAME) |
| 211 | 211 | ||
| 212 | -include $(USER_PATH)/rules.mk | 212 | -include $(USER_PATH)/rules.mk |
| 213 | ifneq ("$(wildcard users/$(KEYMAP)/config.h)","") | 213 | ifneq ("$(wildcard $(USER_PATH)/config.h)","") |
| 214 | CONFIG_H += users/$(KEYMAP)/config.h | 214 | CONFIG_H += $(USER_PATH)/config.h |
| 215 | endif | 215 | endif |
| 216 | 216 | ||
| 217 | 217 | ||