diff options
author | Achim Gratz <Stromeko@Stromeko.DE> | 2014-07-02 20:33:04 +0200 |
---|---|---|
committer | Achim Gratz <Stromeko@Stromeko.DE> | 2014-07-02 20:33:04 +0200 |
commit | bd8bad281a37fb9a16b02db551447012dbe95080 (patch) | |
tree | d6b7acb3795d46bb4e35e8d38d1a976e289ee7a3 | |
parent | 126e2bcebda6d45d0047f89209339c6721b458d8 (diff) | |
parent | d1692902f1e86a91b57bbbc985293f4eaf64dce5 (diff) | |
download | org-mode-bd8bad281a37fb9a16b02db551447012dbe95080.tar.gz |
Merge branch 'maint'
-rw-r--r-- | mk/targets.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/targets.mk b/mk/targets.mk index 1936966..d390fdb 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 |