From 90649aa151961318d3827fad9f8e9d319ac934fc Mon Sep 17 00:00:00 2001 From: Jimmy Hartzell Date: Mon, 26 Nov 2018 17:39:34 -0500 Subject: [PATCH] makefile update --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 78efcdcf..9538e021 100644 --- 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)