summaryrefslogtreecommitdiff
path: root/keyboard/hhkb/Makefile
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2015-01-14 22:48:54 -0500
committerJack Humbert <jack.humb@gmail.com>2015-01-14 22:48:54 -0500
commita54da1b92663606f5e5c18bc1eaec30c06847da1 (patch)
treea1b7485debf62a8c52d1db3199436cac2f3ce346 /keyboard/hhkb/Makefile
parent4225f0353c2eb85fbd8ca0622eb89757975093e4 (diff)
parent10a6b2c7d8bc9c5d2657acdeefa1102be5035280 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboard/hhkb/Makefile')
-rw-r--r--keyboard/hhkb/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 5cf02d194e..dc5c06a948 100644
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -121,11 +121,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover
#HHKB_JP = yes # HHKB JP support
-ifdef HHKB_JP
- OPT_DEFS += -DHHKB_JP
-endif
-
-
#
# Keymap file
#
@@ -140,6 +135,11 @@ else
endif
+ifneq (, $(or $(findstring keymap_jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
+ OPT_DEFS += -DHHKB_JP
+endif
+
+
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)