[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 291/299: Build HTML doc with makeinfo if texi2html is not availab
From: |
Stefan Monnier |
Subject: |
[elpa] 291/299: Build HTML doc with makeinfo if texi2html is not available. |
Date: |
Sun, 02 Nov 2014 03:12:03 +0000 |
monnier pushed a commit to branch externals/auctex
in repository elpa.
commit 7afab11e35da14264cb416574d3df31f06e3626e
Author: Mosè Giordano <address@hidden>
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 <address@hidden>
+ * 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 @@ address@hidden@
address@hidden@
address@hidden@
DESTDIR=
address@hidden@
+# 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@,:)
+ address@hidden@
+ TEXI2HTML_TOC=auctex_toc.html
+else
+ ifneq (@MAKEINFO@,:)
+ address@hidden@ --html
+ TEXI2HTML_TOC=index.html
+ else
+ address@hidden@
+ TEXI2HTML_TOC=auctex_toc.html
+ endif
+endif
address@hidden@
address@hidden@
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
- [elpa] 278/299: Fix the expansion of %' in TeX-expand-list., (continued)
- [elpa] 278/299: Fix the expansion of %' in TeX-expand-list., Stefan Monnier, 2014/11/01
- [elpa] 286/299: Rename LaTeX-amstext-package-option to LaTeX-amstext-package-options., Stefan Monnier, 2014/11/01
- [elpa] 285/299: Use `push-mark' instead of `set-mark'., Stefan Monnier, 2014/11/01
- [elpa] 284/299: Fix \end buffer position passed to hooks., Stefan Monnier, 2014/11/01
- [elpa] 290/299: Fix LaTeX-newline when comment-auto-fill-only-comments is non-nil., Stefan Monnier, 2014/11/01
- [elpa] 287/299: Docstring fix., Stefan Monnier, 2014/11/01
- [elpa] 276/299: Code cleanup and optimizations., Stefan Monnier, 2014/11/01
- [elpa] 288/299: Avoid duplicate marks in TeX-insert-dollar., Stefan Monnier, 2014/11/01
- [elpa] 289/299: Add style for cleverref., Stefan Monnier, 2014/11/01
- [elpa] 295/299: Fix in LaTeX-largest-level-set for XEmacs compatibility., Stefan Monnier, 2014/11/01
- [elpa] 291/299: Build HTML doc with makeinfo if texi2html is not available.,
Stefan Monnier <=
- [elpa] 296/299: Fix indentation of tabularx environment closing., Stefan Monnier, 2014/11/01
- [elpa] 292/299: Update for upcoming release., Stefan Monnier, 2014/11/01
- [elpa] 298/299: Release_11.88, Stefan Monnier, 2014/11/01
- [elpa] 297/299: Minor fix to previous change., Stefan Monnier, 2014/11/01
- [elpa] 293/299: Use autoconf variables for preview version and date., Stefan Monnier, 2014/11/01
- [elpa] 294/299: Manually adjust preview release version in dtx., Stefan Monnier, 2014/11/01
- [elpa] 282/299: Allow applying style hooks only in a certain context., Stefan Monnier, 2014/11/01
- [elpa] 299/299: Merge from upstream release 11.88., Stefan Monnier, 2014/11/01