1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From d79b74323d83f473fe862bedac01935684a7c7f6 Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Fri, 15 Jul 2022 14:45:11 -0500
Subject: Build org.info from org.org without emacs source tree
---
doc/misc/Makefile.in | 4 ++--
doc/misc/org-setup.org | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index d12f252d550..b336511de6c 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -225,7 +225,7 @@ abs_top_builddir =
# Prevent any settings in the user environment causing problems.
unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH
-EMACS = ${abs_top_builddir}/src/emacs
+EMACS = /usr/bin/emacs
emacs = "${EMACS}" -batch --no-site-file --no-site-lisp --eval '(setq load-prefer-newer t)'
# Generated .texi files go in srcdir so they can be included in the
@@ -233,7 +233,7 @@ emacs =
# Work in srcdir (and use abs_top_builddir) so that +setupfile and
# things like org-setup's "version" macro work. Sigh.
define org_template
- $(1:.org=.texi): $(1) ${top_srcdir}/lisp/org/ox-texinfo.el
+ $(1:.org=.texi): $(1)
$${AM_V_GEN}cd "$${srcdir}" && $${emacs} -l ox-texinfo \
--eval '(setq gc-cons-threshold 50000000)' \
--eval '(setq org-confirm-babel-evaluate nil)' \
diff --git a/doc/misc/org-setup.org b/doc/misc/org-setup.org
index b567af30a2c..0c645c84faf 100644
--- a/doc/misc/org-setup.org
+++ b/doc/misc/org-setup.org
@@ -45,7 +45,7 @@
# returns major.minor version number. This is sufficient since bugfix
# releases are not expected to add features and therefore imply manual
# modifications.
-#+macro: version (eval (with-current-buffer (find-file-noselect "../../lisp/org/org.el") (org-with-point-at 1 (if (re-search-forward "Version: +\\([0-9.]+\\)" nil t) (mapconcat #'identity (cl-subseq (split-string (match-string-no-properties 1) "\\.") 0 2) ".") (error "Missing \"Version\" keyword in \"org.el\"")))))
+#+macro: version (eval (let ((v (getenv "DEB_EMACS_BUILD_ORG_DOC_VERSION"))) (if v v (error "DEB_EMACS_BUILD_ORG_DOC_VERSION is unset"))))
# The "kbd" macro turns KBD into @kbd{KBD}. Additionally, it
# encloses case-sensitive special keys (SPC, RET...) within @key{...}.
|
