aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2024-06-07 20:09:20 +0200
committerJonas Bernoulli <jonas@bernoul.li>2024-06-07 20:09:20 +0200
commit8915485e08c0a49b8dad11dc1bf8acabc04a38ee (patch)
tree969d76909268ab3d6d8484c7fa7e2a518c5e26ee
parent8b2d4b03ecf9635c165d1c0f90cd6f2eb415cafa (diff)
make: Integrate texi target
Now that an Org version (9.6), which contains the necessary changes to ox-texinfo, has been released, we assume that users have the necessary tools.
-rw-r--r--Makefile2
-rw-r--r--docs/Makefile24
2 files changed, 13 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 4e4985c..5c31ff1 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ help:
$(info make lisp - compile elisp)
$(info make redo - re-compile elisp)
$(info make docs - generate info manuals)
+ $(info make texi - generate texi manual)
$(info make info - generate info manuals)
$(info make html - generate html manual files)
$(info make html-dir - generate html manual directories)
@@ -58,7 +59,6 @@ help:
$(info Release Management)
$(info ==================)
$(info )
- $(info make texi - regenerate texi from org)
$(info make authors - regenerate AUTHORS.md)
$(info make publish - publish snapshot manuals)
$(info make release - publish release manuals)
diff --git a/docs/Makefile b/docs/Makefile
index 6fb53eb..466603e 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,17 +3,28 @@ include ../default.mk
## ###################################################################
-.PHONY: texi install clean AUTHORS.md stats
+.PHONY: install clean AUTHORS.md stats
all: info
## Build #############################################################
+texi: $(TEXIPAGES)
info: $(INFOPAGES) dir
html: $(HTMLFILES)
pdf: $(PDFFILES)
epub: $(EPUBFILES)
+ORG_ARGS = --batch -Q $(ORG_LOAD_PATH) -l ol-man
+ORG_EVAL += --eval "(progn $$ORG_MAN_EXPORT)"
+ORG_EVAL += --eval "(setq indent-tabs-mode nil)"
+ORG_EVAL += --eval "(setq org-src-preserve-indentation nil)"
+ORG_EVAL += --funcall org-texinfo-export-to-texinfo
+
+%.texi: %.org
+ @printf "Generating $@\n"
+ @$(EMACS) $(ORG_ARGS) $< $(ORG_EVAL)
+
%.info: %.texi
@printf "Generating $@\n"
@$(MAKEINFO) --no-split $< -o $@
@@ -84,17 +95,6 @@ clean:
## Release management ################################################
-ORG_ARGS = --batch -Q $(ORG_LOAD_PATH) -l ol-man
-ORG_EVAL += --eval "(progn $$ORG_MAN_EXPORT)"
-ORG_EVAL += --eval "(setq indent-tabs-mode nil)"
-ORG_EVAL += --eval "(setq org-src-preserve-indentation nil)"
-ORG_EVAL += --funcall org-texinfo-export-to-texinfo
-
-texi:
- @printf "Generating $(PKG).texi\n"
- @$(EMACS) $(ORG_ARGS) $(PKG).org $(ORG_EVAL)
- @$(EMACS) $(ORG_ARGS) magit-section.org $(ORG_EVAL)
-
authors: AUTHORS.md
AUTHORS.md: