blink1-tool: makefile var fixes

vgonugunta · Dec 4, 2014 · 7aca1fc · 7aca1fc
1 parent 8542e5c
commit 7aca1fc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/commandline/blink1control-tool/Makefile b/commandline/blink1control-tool/Makefile
@@ -41,11 +41,12 @@ ifeq "$(UNAME)" "FreeBSD"
 endif
 
 MACH_TYPE="$(strip $(shell uname -m))"
-GIT_TAG="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
+GIT_TAG=$(strip $(shell cat ../../VERSIONS.txt | tail -1 | cut -f1 -d' '))
+#GIT_TAG="$(strip $(shell git tag 2>&1 | tail -1 | cut -f1 -d' '))"
 # deal with case of no git or no git tags, check for presence of "v" (i.e. "v1.93")
-ifneq ($(findstring v,$(GIT_TAG)), v)
-  GIT_TAG = "v0"
-endif
+#ifneq ($(findstring v,$(GIT_TAG)), v)
+#  GIT_TAG = "v0"
+#endif
 
 BLINK1_VERSION="$(GIT_TAG)-$(OS)-$(MACH_TYPE)"