Merge pull request #1 from alh84001/patch-1

[max/tmk_keyboard.git] / tmk_core / common.mk

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 8e6ba561315e03c532b41e6cca8b040c1f137457..4c943f04089c18282bf99b27ac8b951da7ada450 100644 (file)
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -1,4 +1,4 @@
-COMMON_DIR = $(TMK_DIR)/common
+COMMON_DIR = common
 SRC += $(COMMON_DIR)/host.c \
        $(COMMON_DIR)/keyboard.c \
        $(COMMON_DIR)/action.c \
@@ -81,7 +81,8 @@ ifdef KEYMAP_SECTION_ENABLE
 endif
 
 # Version string
-OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
+VERSION := $(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
+OPT_DEFS += -DVERSION=$(VERSION)
 
 
 # Search Path