makefile update

obsidiansystems · Nov 26, 2018 · 90649aa · 90649aa
1 parent a398baf
commit 90649aa
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -26,16 +26,14 @@ else
 APPNAME = "Tezos Wallet"
 endif
 APP_LOAD_PARAMS=--appFlags 0 --curve ed25519 --curve secp256k1 --curve prime256r1 --path "44'/1729'" $(COMMON_LOAD_PARAMS)
-VERSION_TAG=$(shell git tag | grep '^v' | sort | tail -n1)
+VERSION_TAG=$(shell git tag | grep '^v' | sort | tail -n1 | cut -f1 -d-)
 APPVERSION_M=1
 APPVERSION_N=4
 APPVERSION_P=2
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
 ifneq (v$(APPVERSION), $(VERSION_TAG))
-    ifneq (v$(APPVERSION)-rc, $(VERSION_TAG))
-        $(warning "Version-Tag Mismatch: v$(APPVERSION) version and $(VERSION_TAG) tag")
-    endif
+    $(warning "Version-Tag Mismatch: v$(APPVERSION) version and $(VERSION_TAG) tag")
 endif
 
 COMMIT := $(shell git describe --abbrev=8 --always)