2014-10-17 0:17 GMT+02:00 Mosè Giordano <m...@gnu.org>:
> Hi Ken,
>
> 2014-10-16 23:38 GMT+02:00 Ken Brown <kbr...@cornell.edu>:
>> On 10/11/2014 6:36 PM, Ken Brown wrote:
>>>
>>> On 10/10/2014 7:13 PM, Norbert Preining wrote:
>>>>
>>>> I will inquire with texinfo people why makeinfo --pdf and texi2pdf
>>>> behave differently.
>>>
>>>
>>> I just sent a bug report about this:
>>>
>>> http://lists.gnu.org/archive/html/bug-texinfo/2014-10/msg00015.html
>>
>>
>> And Karl's answer can be found here:
>>
>> http://lists.gnu.org/archive/html/bug-texinfo/2014-10/msg00031.html
>
> Thank you for the update, I think we can stick with texi2pdf and
> texi2dvi then. Since no one objected, I'm going to replace texi2html
> with makeinfo.
Since someone may want to be still able to build the HTML
documentation with texi2html, or their makeinfo isn't update enough, I
wrote the attached patch to support both engines. Norbert, will
AUCTeX build on Debian in this way?
Bye,
Mosè
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 40e40ce..1a5dcc1 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
_______________________________________________
auctex mailing list
auctex@gnu.org
https://lists.gnu.org/mailman/listinfo/auctex
