branch: externals-release/org
commit 04d56f757f110951944708a9cd9ea58ce28175d6
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
mk/targets.mk (GITVERSION): Fix version string for ELPA build
* mk/targets.mk (GITVERSION): Use previous convention for the Org
version string on ELPA, where Org release tags are not available.
Instead of the new release_N/A-N/A prefix, use the Org version from
org.el file headers, as we did in Org 9.6.
Reported-by: Sharon Kimble <boudic...@skimble09.plus.com>
Link: https://orgmode.org/list/87ikynyggt....@skimble09.plus.com
---
mk/targets.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mk/targets.mk b/mk/targets.mk
index de849c4fba..d8c2a5294a 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -13,7 +13,7 @@ ifneq ($(wildcard .git),)
# 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
2>/dev/null || echo "release_N/A-N/A-$(shell git describe --match release\*
--abbrev=6 --always HEAD)")
+ GITVERSION := $(shell git describe --match release\* --abbrev=6 HEAD
2>/dev/null || echo "${ORGVERSION}-$(shell git describe --match release\*
--abbrev=6 --always HEAD)")
GITSTATUS := $(shell git status -uno --porcelain)
else
-include mk/version.mk
