monnier pushed a commit to branch externals/auctex
in repository elpa.
commit 7afab11e35da14264cb416574d3df31f06e3626e
Author: Mosè Giordano <[email protected]>
Date: Wed Oct 22 15:53:27 2014 +0200
Build HTML doc with makeinfo if texi2html is not available.
* doc/Makefile.in: Make it possible to build the HTML doc with
`makeinfo' if `texi2html' is not available. Add new
`TEXI2HTML_TOC' variable.
(extradist): Use `TEXI2HTML_TOC'.
(html/$(TEXI2HTML_TOC)): Use `TEXI2HTML_TOC'. Fix splitting
option to HTML engine. Suggested by Norbert Preining.
---
ChangeLog | 7 +++++++
doc/Makefile.in | 22 ++++++++++++++++++----
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 24e2066..dec8e64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2014-10-22 Mos� Giordano <[email protected]>
+ * doc/Makefile.in: Make it possible to build the HTML doc with
+ `makeinfo' if `texi2html' is not available. Add new
+ `TEXI2HTML_TOC' variable.
+ (extradist): Use `TEXI2HTML_TOC'.
+ (html/$(TEXI2HTML_TOC)): Use `TEXI2HTML_TOC'. Fix splitting
+ option to HTML engine. Suggested by Norbert Preining.
+
* latex.el (LaTeX-newline): Fix for when
`comment-auto-fill-only-comments' is non-nil. Suggested by Piet
van Oostrum.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 40e40ce..8507821 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -35,7 +35,21 @@ INSTALL_INFO=@INSTALL_INFO@
INSTALL=@INSTALL@
INSTALL_DATA=@INSTALL_DATA@
DESTDIR=
-TEXI2HTML=@TEXI2HTML@
+# If `texi2html' is not available, use `makeinfo' when possible. Set the ToC
+# file accordingly. Actually, makeinfo >= 5 is needed, but we don't check the
+# version.
+ifneq (@TEXI2HTML@,:)
+ TEXI2HTML=@TEXI2HTML@
+ TEXI2HTML_TOC=auctex_toc.html
+else
+ ifneq (@MAKEINFO@,:)
+ TEXI2HTML=@MAKEINFO@ --html
+ TEXI2HTML_TOC=index.html
+ else
+ TEXI2HTML=@TEXI2HTML@
+ TEXI2HTML_TOC=auctex_toc.html
+ endif
+endif
TEXI2DVI=@TEXI2DVI@
TEXI2PDF=@TEXI2PDF@
MKINSTALLDIRS = ../mkinstalldirs
@@ -73,17 +87,17 @@ install-man:
dist: $(DISTTEXTS) preview-latex.info auctex.info tex-ref.pdf
-extradist: html/auctex_toc.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
+extradist: html/$(TEXI2HTML_TOC) auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
.PHONY: all info dvi dist install-auctex disttexts clean distclean \
maintainer-clean install-preview install-man html-docs extradist
# AUCTeX
-html/auctex_toc.html: auctex.texi
+html/$(TEXI2HTML_TOC): auctex.texi
rm -rf html
mkdir html
- cd html && $(TEXI2HTML) -split_node -I .. ../auctex.texi && \
+ cd html && $(TEXI2HTML) --split=node -I .. ../auctex.texi && \
test ! -d auctex || { mv auctex/* . && rm -rf auctex ; }
tex-ref.dvi: tex-ref.tex
