From 85f8506caa00b06f525fc8e62a9fac2093ab8310 Mon Sep 17 00:00:00 2001
From: Reed Swiernik <rswiernik@csh.rit.edu>
Date: Wed, 29 Apr 2015 02:47:56 -0400
Subject: Moved keymap file location and fixed bugs in keymap_reed.c

---
 keyboard/planck/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'keyboard/planck/Makefile')

diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index ef11e3d32b..e32e4f97e8 100644
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@@ -58,9 +58,9 @@ ifdef COMMON_KEYMAP
 	backlight.c
 
 ifdef KEYMAP
-    SRC := keymap_$(KEYMAP).c $(SRC)
+    SRC := common_keymaps/keymap_$(KEYMAP).c $(SRC)
 else
-    SRC := keymap_jack.c $(SRC)
+    SRC := common_keymaps/keymap_jack.c $(SRC)
 endif
 
 else
@@ -71,9 +71,9 @@ SRC = extended_keymap_common.c \
 	backlight.c
 
 ifdef KEYMAP
-    SRC := extended_keymap_$(KEYMAP).c $(SRC)
+    SRC := extended_keymaps/extended_keymap_$(KEYMAP).c $(SRC)
 else
-    SRC := extended_keymap_jack.c $(SRC)
+    SRC := extended_keymaps/extended_keymap_jack.c $(SRC)
 endif
 
 endif
-- 
cgit v1.2.3


From 15110bf7a06badecb80dba351bb52fce6588dabe Mon Sep 17 00:00:00 2001
From: Reed Swiernik <rswiernik@csh.rit.edu>
Date: Wed, 29 Apr 2015 02:49:58 -0400
Subject: Corrected makefile common var

---
 keyboard/planck/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboard/planck/Makefile')

diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index e32e4f97e8..e021e9e90b 100644
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@@ -50,7 +50,7 @@ TARGET_DIR = .
 
 
 # # project specific files
-ifdef COMMON_KEYMAP
+ifdef COMMON
 
 	SRC = keymap_common.c \
 	matrix_handwire.c \
-- 
cgit v1.2.3