X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=1b56896d90719a55341134e6c04f5afd9fb3ea9c;hb=b504ab8b02e2891c33e9883a4bb1a3e0f90b2b1e;hp=ef2644d7243b73ff678002222a08a87f37caffbd;hpb=c35d7a0fc8bbb1f9123bb41a7b66e45ea2564dd2;p=src%2Fxds%2Fxds-cli.git

diff --git a/Makefile b/Makefile
index ef2644d..1b56896 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 # Makefile used to build xds-cli commands
 
-# Application Version
+# Application Name
 TARGET=xds-cli
 
 
 # Retrieve git tag/commit to set version & sub-version strings
 GIT_DESC := $(shell git describe --always --tags)
 VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
-SUB_VERSION := $(wordlist 2,3,$(subst -, ,$(GIT_DESC)))
+SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
 ifeq ($(VERSION), )
 	VERSION := unknown-dev
 endif
@@ -58,9 +58,9 @@ endif
 
 
 ifeq ($(SUB_VERSION), )
-	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-v$(VERSION).zip
+	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
 else
-	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip
+	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
 endif
 
 .PHONY: all