From d1692902f1e86a91b57bbbc985293f4eaf64dce5 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Wed, 2 Jul 2014 20:32:24 +0200 Subject: [PATCH] mk/targets.mk: consider only release_* tags for constructing version strings --- mk/targets.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/targets.mk b/mk/targets.mk index aef11eb14..7f26d86d9 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -11,8 +11,8 @@ INSTSUB = $(SUBDIRS:%=install-%) ORG_MAKE_DOC ?= info html pdf ifneq ($(wildcard .git),) - GITVERSION ?= $(shell git describe --abbrev=6 HEAD) - ORGVERSION ?= $(subst release_,,$(shell git describe --abbrev=0 HEAD)) + GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD) + ORGVERSION ?= $(subst release_,,$(shell git describe --match release\* --abbrev=0 HEAD)) GITSTATUS ?= $(shell git status -uno --porcelain) else -include mk/version.mk