]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Change VPATH path addition order (#5754)
authorDrashna Jaelre <drashna@live.com>
Thu, 2 May 2019 15:01:58 +0000 (08:01 -0700)
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>
Thu, 2 May 2019 15:01:58 +0000 (08:01 -0700)
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.

build_keyboard.mk

index 5d633f27169005d98eb9311cff91bca90180aad4..510923ebe1288332e2d10e2142e5650196f81a5c 100644 (file)
@@ -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