summaryrefslogtreecommitdiff
path: root/keyboard/hhkb/Makefile
diff options
context:
space:
mode:
authorNathan Ross Powell <nathanrosspowell@gmail.com>2015-03-18 23:33:42 -0400
committerNathan Ross Powell <nathanrosspowell@gmail.com>2015-03-18 23:33:42 -0400
commit80c4cdb245a3ff55627d40a3a164073b30382def (patch)
treee134969a2fc20979101a7e9e7aa06c1877bf82eb /keyboard/hhkb/Makefile
parente7289bb029b28b824eb0ef7be23dba279057d7ac (diff)
parent9c3a95663410a294f2c85ad2d1c016f328730e0b (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)