Update/fix rpm and deb packaging

[src/xds/xds-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 38ee4a6..3877ab7 100644 (file)
--- 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: