Skip to content

Commit

Permalink
Makefile: only use vN tags for EXTRA_VERSION
Browse files Browse the repository at this point in the history
In case we'd want to use some extra fancy tag.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
  • Loading branch information
kolyshkin committed May 2, 2017
1 parent abbf4cf commit 2b4920d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ PACKAGE=ioping
GIT_VER:=$(shell test -d .git && git describe --tags --match 'v[0-9]*' \
--abbrev=0 | sed 's/v//')
SRC_VER:=$(shell sed -ne 's/\# define VERSION \"\(.*\)\"/\1/p' ioping.c)
EXTRA_VERSION:=$(shell test -d .git && git describe --tags --dirty=+ | sed 's/^v[^-]*//;s/-/./g')
EXTRA_VERSION:=$(shell test -d .git && git describe --tags --match 'v[0-9]*' \
--dirty=+ | sed 's/^v[^-]*//;s/-/./g')
VERSION:=$(SRC_VER)$(EXTRA_VERSION)
DISTDIR=$(PACKAGE)-$(VERSION)
DISTFILES=$(SRCS) $(MANS) $(DOCS) $(SPEC) Makefile
Expand Down

0 comments on commit 2b4920d

Please sign in to comment.