X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=d088c5d5c0bd203c1333bbd32973bbf81efcad33;hb=e113bbc75f88457d29f11823af0ff902e7c2ac8b;hp=bd4fe0fff251e15e4247d541f56ff3299e015d16;hpb=abb904e0e250ff4a77e789a887d331f45a6d8410;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index bd4fe0f..d088c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,7 @@ VERSION := 0.1.0
 
 # Syncthing version to install
 SYNCTHING_VERSION = 0.14.28
-# FIXME: use master while waiting a release that include #164
-#SYNCTHING_INOTIFY_VERSION = 0.8.5
-SYNCTHING_INOTIFY_VERSION=master
+SYNCTHING_INOTIFY_VERSION = 0.8.6
 
 
 # Retrieve git tag/commit to set sub-version string
@@ -17,7 +15,7 @@ ifeq ($(origin SUB_VERSION), undefined)
 		VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
 		SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))
 	else
-		SUB_VERSION := $(shell git describe --tags --always  | sed 's/^v//')
+		SUB_VERSION := $(shell git rev-parse --short HEAD)
 		ifeq ($(SUB_VERSION), )
 			SUB_VERSION := unknown-dev
 		endif
@@ -57,7 +55,6 @@ LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
 LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
 PACKAGE_DIR := $(ROOT_SRCDIR)/package
 
-
 export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
 export PATH := $(PATH):$(LOCAL_TOOLSDIR)
 
@@ -84,9 +81,9 @@ endif
 all: tools/syncthing build
 
 .PHONY: build
-build: xds webapp
+build: vendor xds webapp
 
-xds:vendor scripts tools/syncthing/copytobin
+xds: scripts tools/syncthing/copytobin
 	@echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION))";
 	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
 
@@ -121,7 +118,7 @@ webapp/debug:
 
 webapp/install:
 	(cd webapp && npm install)
-	@test -d ${DESTDIR}/usr/local/etc && rm -rf ${DESTDIR}/usr
+	@if [ -d ${DESTDIR}/usr/local/etc ]; then rm -rf ${DESTDIR}/usr; fi
 
 .PHONY: scripts
 scripts: