From 77f9e16d7436ca629384e6574f2231e275ea8447 Mon Sep 17 00:00:00 2001 Message-Id: <77f9e16d7436ca629384e6574f2231e275ea8447.1664104208.git.yantar92@gmail.com> From: Ihor Radchenko Date: Sun, 25 Sep 2022 19:02:17 +0800 Subject: [PATCH] * mk/targets.mk (ORGVERSION): Prefer lisp/org.el version header Do not use the latest Git tag. Prefer the Version header in org.el. The Git tag on main branch is only available for the latest release. Before this commit, development Org version was indistinguishable from the release version. See https://orgmode.org/list/8735cfn44v.fsf@gnu.org --- mk/targets.mk | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/mk/targets.mk b/mk/targets.mk index 5cba63e21..518635737 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -11,16 +11,10 @@ INSTSUB = $(SUBDIRS:%=install-%) ORG_MAKE_DOC ?= info html pdf ifneq ($(wildcard .git),) - ORGVERSION ?= $(subst release_,,$(shell git describe --match release\* --abbrev=0 HEAD)) - ifeq ($(ORGVERSION),) - # In elpa.git, there are no tags available. Fall back to using - # the org.el header. - ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 'lisp-mnt)" \ - --visit lisp/org.el --eval '(princ (lm-header "version"))')) - GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD) - else - GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD) - endif + # Use the org.el header. + ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 'lisp-mnt)" \ + --visit lisp/org.el --eval '(princ (lm-header "version"))')) + GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD) GITSTATUS ?= $(shell git status -uno --porcelain) else -include mk/version.mk -- 2.35.1