summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2014-07-02 20:32:24 +0200
committerAchim Gratz <Stromeko@Stromeko.DE>2014-07-02 20:32:24 +0200
commitd1692902f1e86a91b57bbbc985293f4eaf64dce5 (patch)
treee253489452cf7619d8134eb70806d7a3c5ec9396
parenta5beff869fa198450ac68b8d3cad1e79089ff75c (diff)
downloadorg-mode-d1692902f1e86a91b57bbbc985293f4eaf64dce5.tar.gz
mk/targets.mk: consider only release_* tags for constructing version strings
-rw-r--r--mk/targets.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/targets.mk b/mk/targets.mk
index aef11eb..7f26d86 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