X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=d088c5d5c0bd203c1333bbd32973bbf81efcad33;hb=bf2487c4e4c925f437f9e72f09f6ef5099a0c3cb;hp=916b13365224e8fcb19e01cf8f03d6b369016af2;hpb=6aa0d4b8cdda11c7ee218f0f3cc1013dd18ab056;p=src%2Fxds%2Fxds-server.git diff --git a/Makefile b/Makefile index 916b133..d088c5d 100644 --- a/Makefile +++ b/Makefile @@ -15,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 @@ -55,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)