X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=3877ab7bcf2155a8ddf0da970bdeb7a164785750;hb=8f454ab11d3c0e9b6a40e125230539420dbbeb8b;hp=38ee4a69613e2452ab6be35712a9ddc9d5e180f9;hpb=2a7a112bbffcd41a3436c086f1910ea7a9c94744;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index 38ee4a6..3877ab7 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,10 @@ endif
 ifeq ($(SUB_VERSION), )
 	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
 else
-	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
+	# only use dot as separator to allow rpm packaging (see version .spec file)
+	PK_VER := $(subst _,.,$(subst -,,$(VERSION)))
+	PK_SBVER := $(subst _,.,$(subst -,,$(SUB_VERSION)))
+	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(PK_VER).$(PK_SBVER).zip
 endif
 
 
@@ -190,7 +193,7 @@ vendor: tools/glide glide.yaml
 
 vendor/debug: vendor
 	(cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \
-		rm -rf xds-common && ln -s ../../../../../../xds-common )
+		rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git  )
 
 .PHONY: tools/glide
 tools/glide: