forked from mirrors/org-mode
mk/targets.mk: consider only release_* tags for constructing version strings
Cherry-picked fromd1692902f1
, which was dropped by force-pushing79873390ed
.
This commit is contained in:
parent
507244d56b
commit
3f67b185cc
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue