From f57fab831252ebe5037ceabe9843623c4bd14f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Wed, 27 Aug 2014 12:01:58 +0200 Subject: Imported Upstream version 8.2.7c --- mk/targets.mk | 4 ++-- mk/version.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mk') 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 -- cgit v1.2.3