diff options
author | Jack Humbert <jack.humb@gmail.com> | 2016-01-23 20:33:35 -0500 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2016-01-23 20:33:35 -0500 |
commit | 544a49329cac78206c0d195f2e7bfd39db05507d (patch) | |
tree | bfcd304f7215738909e1241d73a77a426f5a195c /keyboard/ergodox_ez/Makefile | |
parent | a820533ab770e1919f190c102a091c1060f6302e (diff) | |
parent | e5aee62e54d0b6f02ff170f4e9bf1e738d36fb4c (diff) |
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile
Diffstat (limited to 'keyboard/ergodox_ez/Makefile')
-rw-r--r-- | keyboard/ergodox_ez/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/keyboard/ergodox_ez/Makefile b/keyboard/ergodox_ez/Makefile index 03c806131d..8066c7bb4b 100644 --- a/keyboard/ergodox_ez/Makefile +++ b/keyboard/ergodox_ez/Makefile @@ -31,15 +31,14 @@ SRC = ergodox_ez.c \ matrix.c ifdef KEYMAP - SRC := keymaps/keymap_$(KEYMAP).c $(SRC) + SRC := keymaps/$(KEYMAP)/keymap.c $(SRC) else - SRC := keymaps/keymap_default.c $(SRC) + SRC := keymaps/default/keymap.c $(SRC) endif CONFIG_H = config.h # MCU name -#MCU = at90usb1287 MCU = atmega32u4 # Processor frequency. |