diff options
| author | Sébastien Delafond <sdelafond@gmail.com> | 2014-08-27 12:01:58 +0200 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-08-27 12:01:58 +0200 |
| commit | f57fab831252ebe5037ceabe9843623c4bd14f15 (patch) | |
| tree | d383b556871ea0034a90209c6d2dce523975701a /mk | |
| parent | 75a81babfdc3c8c643962fd77b034b42e20cbee3 (diff) | |
Imported Upstream version 8.2.7c
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/targets.mk | 4 | ||||
| -rw-r--r-- | mk/version.mk | 4 |
2 files changed, 4 insertions, 4 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 diff --git a/mk/version.mk b/mk/version.mk index e1f6173..bb6d0fe 100644 --- a/mk/version.mk +++ b/mk/version.mk @@ -1,2 +1,2 @@ -ORGVERSION ?= 8.2.7b -GITVERSION ?= 8.2.7b-dist +ORGVERSION ?= 8.2.7c +GITVERSION ?= 8.2.7c-dist |