From: shela <shela.weblog@gmail.com>
Date: Sat, 10 Sep 2016 17:46:06 +0000 (+0900)
Subject: Variables in Makefile are ignored in rules.mk
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2a8536f00fb7e3a547fb5b626279e2e391e556d5;p=qmk_firmware.git

Variables in Makefile are ignored in rules.mk
---

diff --git a/keyboards/hhkb/keymaps/jp/Makefile b/keyboards/hhkb/keymaps/jp/Makefile
index 92986292a..a7f700f01 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 92986292a..a7f700f01 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 e6fc7260e..a46271f02 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