summaryrefslogtreecommitdiffstats
path: root/build_keyboard.mk
diff options
context:
space:
mode:
authorJoe Wasson <jwasson+github@gmail.com>2018-04-21 19:48:30 +0200
committerDrashna Jaelre <drashna@live.com>2018-04-21 19:48:30 +0200
commit5ca9aecfb4cb09cc002a5256939098132a40015f (patch)
tree820a45256a06f41983312707512f564f2f973c78 /build_keyboard.mk
parent33fdd1d2551591a5c295c6dc68ccf52c4698b9c1 (diff)
downloadqmk_firmware-5ca9aecfb4cb09cc002a5256939098132a40015f.tar.gz
qmk_firmware-5ca9aecfb4cb09cc002a5256939098132a40015f.tar.xz
Talljoe's layout with common keymap. (#2764)
* Add userspace to talljoe layout. * Move more authority to userspace and create Bananasplit layout. * Move more things into userspace. * Common Core example * More work on common layout. * Num layer. * talljoe-ansi layout * Updates for Zeal60 * Add Zeal60 to 60_ansi_split_bs_rshift * Swap Escape and Grave * Num-layer tweaks * More tweaks. * Add 1up60rgb to world of layouts. * Rename ansi_split_bs_rshift layout to hhkb. * Control RGB Backlight. * change capslock led * Remove obsolete line from rules.mk. * Add user-friendly userspace override. * Fix enter for 1uprgb60 * Revert "Rename ansi_split_bs_rshift layout to hhkb." This reverts commit 53133719db25c7cb6a199108bbf5d980481a45f4.
Diffstat (limited to 'build_keyboard.mk')
-rw-r--r--build_keyboard.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 90a3df776..4781f4a5d 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -204,7 +204,11 @@ else
endif
# User space stuff
-USER_PATH := users/$(KEYMAP)
+ifeq ("$(USER_NAME)","")
+ USER_NAME := $(KEYMAP)
+endif
+USER_PATH := users/$(USER_NAME)
+
-include $(USER_PATH)/rules.mk
ifneq ("$(wildcard users/$(KEYMAP)/config.h)","")
CONFIG_H += users/$(KEYMAP)/config.h