From 27b0f8923e845a30adfde13756cb5845b8cd1ab7 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 2 May 2019 08:01:58 -0700
Subject: [PATCH] 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.
---
 build_keyboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_keyboard.mk b/build_keyboard.mk
index 5d633f2716..510923ebe1 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