qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-10-24 09:51:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot
2025-12-05 22:27:01 +00:00
parent 15952e92ca debba50c33
commit 192cf4cef6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builddefs/build_keyboard.mk
+4 -2
View File
@@ -474,8 +474,10 @@ ifneq ($(wildcard $(QMK_USERSPACE)),)
endif endif
# If the equivalent users directory exists in userspace, use that in preference to anything currently in the main repo # If the equivalent users directory exists in userspace, use that in preference to anything currently in the main repo
ifneq ($(wildcard $(QMK_USERSPACE)/$(USER_PATH)),) ifneq ($(QMK_USERSPACE),)
USER_PATH := $(QMK_USERSPACE)/$(USER_PATH) ifneq ($(wildcard $(QMK_USERSPACE)/$(USER_PATH)),)
USER_PATH := $(QMK_USERSPACE)/$(USER_PATH)
endif
endif endif
# Pull in user level rules.mk # Pull in user level rules.mk