Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add stdin support to /exec
[src/xds/xds-server.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
916b133
..
d088c5d
100644
(file)
--- 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
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
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
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)
export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
export PATH := $(PATH):$(LOCAL_TOOLSDIR)