>From 23c941bbdc7d5b7b014b0fce1b4ca5da7f9f349b Mon Sep 17 00:00:00 2001
From: Norbert Preining <address@hidden>
Date: Fri, 10 Oct 2014 10:29:36 +0900
Subject: [PATCH] use texinfo 5.0 style makeinfo --FORMAT, fix invocation

---
 configure.ac    | 6 ------
 doc/Makefile.in | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7add2aa..5068d25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,9 +139,6 @@ cannot be regenerated, but installation of an unmodified tarball will
 succeed.])
 
 AC_PATH_PROG(MAKEINFO, makeinfo, :)
-AC_PATH_PROG(TEXI2HTML, texi2html, :)
-AC_PATH_PROG(TEXI2DVI, texi2dvi, :)
-AC_PATH_PROG(TEXI2PDF, texi2pdf, :)
 
 AC_ARG_VAR(INSTALL_INFO, [install-info executable.  Set to : to skip making a dir file.  This is the default when installing into an XEmacs package.])
 
@@ -193,9 +190,6 @@ AC_SHELL_QUOTIFY(MAKEINFO)
 AC_SHELL_QUOTIFY(TEX)
 AC_SHELL_QUOTIFY(PDFTEX)
 AC_SHELL_QUOTIFY(DVIPS)
-AC_SHELL_QUOTIFY(TEXI2HTML)
-AC_SHELL_QUOTIFY(TEXI2DVI)
-AC_SHELL_QUOTIFY(TEXI2PDF)
 
 AC_OUTPUT(Makefile tex-site.el.out:tex-site.el.in doc/Makefile auctex.el)
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 40e40ce..8140ab8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -35,9 +35,9 @@ address@hidden@
 address@hidden@
 address@hidden@
 DESTDIR=
address@hidden@
address@hidden@
address@hidden@
address@hidden@ --html
address@hidden@ --dvi
address@hidden@ --pdf
 MKINSTALLDIRS = ../mkinstalldirs
 address@hidden@
 address@hidden@
@@ -83,7 +83,7 @@ extradist: html/auctex_toc.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
 html/auctex_toc.html: 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
-- 
2.1.1