Variables in Makefile are ignored in rules.mk

diff --git a/keyboards/hhkb/keymaps/jp/Makefile b/keyboards/hhkb/keymaps/jp/Makefile
index 92986292a233dd6403c6b2f242237021cbbd50fa..a7f700f019c2f3312dc7ca3e58b7bc18cc1f90a9 100644 (file)
--- 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 92986292a233dd6403c6b2f242237021cbbd50fa..a7f700f019c2f3312dc7ca3e58b7bc18cc1f90a9 100644 (file)
--- 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 e6fc7260eed67cb86933d13701d5d4d1ebe0b403..a46271f0234f040438559e5df8f118b3f5914db7 100644 (file)
--- 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