Fix/Update packaging

Change-Id: Ida4a102472c92492cf7d4f0eab301b37ee991cef
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

1 files changed, 14 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 37b64ba..1c6d405 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,10 @@
 # limitations under the License.
 ###########################################################################
 
-
 # Application Name
 TARGET=xds-gdb
 
+
 # Retrieve git tag/commit to set version & sub-version strings
 GIT_DESC := $(shell git describe --always --tags)
 VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
@@ -82,11 +82,13 @@ else
 	BUILD_MODE="Release mode"
 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
 
 .PHONY: all
@@ -112,7 +114,8 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor $(ROOT_SRCDIR)/*.zip
+	rm -rf $(LOCAL_BINDIR) && (cd $(ROOT_SRCDIR) && rm -rf ./tools ./glide.lock ./vendor ./*.zip)
+
 
 .PHONY: scripts
 scripts:
@@ -155,30 +158,31 @@ vendor: tools/glide glide.yaml
 vendor/debug: vendor
 	(cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \
 		rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git && \
-		rm -rf xds-agent.git && ln -s ../../../../../../xds-agent xds-agent.git )
+		rm -rf xds-agent.git && ln -s ../../../../../../xds-agent xds-agent.git)
 
 .PHONY: tools/glide
 tools/glide:
 	@test -f $(LOCAL_TOOLSDIR)/glide || { \
 		echo "Downloading glide"; \
 		mkdir -p $(LOCAL_TOOLSDIR); \
-		curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
+		curl --silent --connect-timeout 60 --retry 3 -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
 	}
 
 .PHONY:
 checkgover:
-	@test "$(CHECKGOVER)" = "true" || { echo $(CHECKERRMSG); exit 1; }
+	@test "$(CHECKGOVER)" = "true" || { echo -e $(CHECKERRMSG); exit 1; }
 
 
 .PHONY: help
 help:
 	@echo "Main supported rules:"
-	@echo "  all               (default)"
+	@echo "  all                (default)"
 	@echo "  build"
 	@echo "  release"
-	@echo "  clean"
 	@echo "  package"
-	@echo "  install / uninstall"
+	@echo "  install"
+	@echo "  uninstall"
+	@echo "  clean"
 	@echo "  distclean"
 	@echo ""
 	@echo "Influential make variables:"