mk/targets.mk: consider only release_* tags for constructing version strings
This commit is contained in:
parent
a5beff869f
commit
d1692902f1
|
@ -11,8 +11,8 @@ INSTSUB = $(SUBDIRS:%=install-%)
|
||||||
ORG_MAKE_DOC ?= info html pdf
|
ORG_MAKE_DOC ?= info html pdf
|
||||||
|
|
||||||
ifneq ($(wildcard .git),)
|
ifneq ($(wildcard .git),)
|
||||||
GITVERSION ?= $(shell git describe --abbrev=6 HEAD)
|
GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD)
|
||||||
ORGVERSION ?= $(subst release_,,$(shell git describe --abbrev=0 HEAD))
|
ORGVERSION ?= $(subst release_,,$(shell git describe --match release\* --abbrev=0 HEAD))
|
||||||
GITSTATUS ?= $(shell git status -uno --porcelain)
|
GITSTATUS ?= $(shell git status -uno --porcelain)
|
||||||
else
|
else
|
||||||
-include mk/version.mk
|
-include mk/version.mk
|
||||||
|
|
Loading…
Reference in New Issue