Code Review
/
src
/
xds
/
xds-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
98a61be
)
Fix version / sub-version retrieval.
author
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Wed, 7 Jun 2017 12:35:59 +0000
(14:35 +0200)
committer
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Wed, 7 Jun 2017 12:35:59 +0000
(14:35 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
2f7ad2d
..
615be53
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,7
+12,7
@@
SYNCTHING_INOTIFY_VERSION=master
# Retrieve git tag/commit to set sub-version string
ifeq ($(origin SUB_VERSION), undefined)
- SUB_VERSION := $(shell git describe --tags 2>/dev/null | sed 's/^v//')
+ SUB_VERSION := $(shell git describe --
exact-match --
tags 2>/dev/null | sed 's/^v//')
ifneq ($(SUB_VERSION), )
VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))