summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshela <shela.weblog@gmail.com>2016-09-11 02:46:06 +0900
committershela <shela.weblog@gmail.com>2016-09-11 02:46:06 +0900
commit2a8536f00fb7e3a547fb5b626279e2e391e556d5 (patch)
treeaffc39c9d355c3e0c35726883d9af33ef61c308e
parent70b4fc808db716ab2b6c659a1e43702c435bfbef (diff)
downloadqmk_firmware-2a8536f00fb7e3a547fb5b626279e2e391e556d5.tar.gz
qmk_firmware-2a8536f00fb7e3a547fb5b626279e2e391e556d5.zip
Variables in Makefile are ignored in rules.mk
-rw-r--r--keyboards/hhkb/keymaps/jp/Makefile2
-rw-r--r--keyboards/hhkb/keymaps/rdg_jp/Makefile2
-rw-r--r--keyboards/hhkb/rules.mk4
3 files changed, 2 insertions, 6 deletions
diff --git a/keyboards/hhkb/keymaps/jp/Makefile b/keyboards/hhkb/keymaps/jp/Makefile
index 92986292a2..a7f700f019 100644
--- a/keyboards/hhkb/keymaps/jp/Makefile
+++ b/keyboards/hhkb/keymaps/jp/Makefile
@@ -1 +1 @@
-HHKB_JP=yes
+OPT_DEFS += -DHHKB_JP
diff --git a/keyboards/hhkb/keymaps/rdg_jp/Makefile b/keyboards/hhkb/keymaps/rdg_jp/Makefile
index 92986292a2..a7f700f019 100644
--- a/keyboards/hhkb/keymaps/rdg_jp/Makefile
+++ b/keyboards/hhkb/keymaps/rdg_jp/Makefile
@@ -1 +1 @@
-HHKB_JP=yes
+OPT_DEFS += -DHHKB_JP
diff --git a/keyboards/hhkb/rules.mk b/keyboards/hhkb/rules.mk
index e6fc7260ee..a46271f023 100644
--- a/keyboards/hhkb/rules.mk
+++ b/keyboards/hhkb/rules.mk
@@ -72,10 +72,6 @@ CUSTOM_MATRIX ?= yes # Custom matrix file for the HHKB
# UNICODE_ENABLE ?= yes # Unicode
# BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID
-ifneq (, $(findstring yes, $(HHKB_JP)))
- OPT_DEFS += -DHHKB_JP
-endif
-
debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
debug-on: all