summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-05-02 17:01:58 +0200
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-05-02 17:01:58 +0200
commit27b0f8923e845a30adfde13756cb5845b8cd1ab7 (patch)
tree24f71adf417f831f9fddce2fe740a5e029d8bb09
parent3da8d46a07167fc862e90b6bb232812d5cb64651 (diff)
downloadqmk_firmware-27b0f8923e845a30adfde13756cb5845b8cd1ab7.tar.gz
qmk_firmware-27b0f8923e845a30adfde13756cb5845b8cd1ab7.tar.xz
Change VPATH path addition order (#5754)
Specifically, to fix some edge cases, and keep the handling consistent, the userspace folder should not actually be added at the end. Ideally, it should be added after the keymap paths, but before the keyboard's path. This issue was discovered in #5484, and the fix created by mtei.
-rw-r--r--build_keyboard.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 5d633f271..510923ebe 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -334,9 +334,9 @@ SRC += $(KEYBOARD_SRC) \
# Search Path
VPATH += $(KEYMAP_PATH)
+VPATH += $(USER_PATH)
VPATH += $(KEYBOARD_PATHS)
VPATH += $(COMMON_VPATH)
-VPATH += $(USER_PATH)
include common_features.mk
include $(TMK_PATH)/protocol.mk