[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 2512fd7: Merge branch 'maint'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 2512fd7: Merge branch 'maint' |
Date: |
Fri, 5 Feb 2021 01:57:09 -0500 (EST) |
branch: externals/org
commit 2512fd702fca4d17f6042f9bfa252a9367fb9f74
Merge: 369eb27 61336f8
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Merge branch 'maint'
---
mk/targets.mk | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/mk/targets.mk b/mk/targets.mk
index 15cbdfa..fc5bed1 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -11,8 +11,16 @@ INSTSUB = $(SUBDIRS:%=install-%)
ORG_MAKE_DOC ?= info html pdf
ifneq ($(wildcard .git),)
- GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD)
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 := $(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
GITSTATUS ?= $(shell git status -uno --porcelain)
else
-include mk/version.mk