Support both texi2html and makeinfo for generating HTML documentation.

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 590460775010522e4c0dbe9fe157864743d735fa..0393c5c89afb39c2bf0995c0c2e295dc424ec5f7 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-05  Bruno Haible  <bruno@clisp.org>
+
+       * autosprintf.texi (ifmakeinfo): Remove alias.
+       (makeinfo): New variable.
+       * Makefile.am (autosprintf_all.html): Don't pass option -expandinfo
+       to texi2html.
+
 2007-05-21  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c: Update comments.

diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index e42430d84e4753c25e549ce2426549ff5b91f154..3da958ffa45e0982d62128565bbd41ade05b9e79 100644 (file)
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -165,7 +165,7 @@ html-local: $(HTMLS)
 # Override of automake's definition.
 # We want to use texi2html, not makeinfo --html.
 autosprintf_all.html: autosprintf.texi
-       $(TEXI2HTML) -expandinfo -number -monolithic `if test -f autosprintf.texi; then echo autosprintf.texi; else echo $(srcdir)/autosprintf.texi; fi`
+       $(TEXI2HTML) -number -monolithic `if test -f autosprintf.texi; then echo autosprintf.texi; else echo $(srcdir)/autosprintf.texi; fi`
        mv autosprintf.html autosprintf_all.html
 
 # The install-html target is already defined by automake.

diff --git a/gettext-runtime/libasprintf/autosprintf.texi b/gettext-runtime/libasprintf/autosprintf.texi
index 383c0c26611b36954d92c9f66cfcd5166a3fb427..a2b1130cdf8588cc91898b5a80a5995654a26f22 100644 (file)
--- a/gettext-runtime/libasprintf/autosprintf.texi
+++ b/gettext-runtime/libasprintf/autosprintf.texi
@@ -1,9 +1,13 @@
 \input texinfo          @c -*-texinfo-*-
 @c %**start of header
 @setfilename autosprintf.info
-@c The @ifmakeinfo ... @end ifnottex conditional evaluates to true in makeinfo
+@c The @ifset makeinfo ... @end ifset conditional evaluates to true in makeinfo
 @c for info and html output, but to false in texi2html.
-@alias ifmakeinfo = ifnottex
+@ifnottex
+@ifclear texi2html
+@set makeinfo
+@end ifclear
+@end ifnottex
 @settitle GNU @code{autosprintf}
 @finalout
 @c Indices:
@@ -18,10 +22,12 @@
 @c %**end of header
 @set VERSION 1.0
 
+@ifinfo
 @dircategory C++ libraries
 @direntry
 * autosprintf: (autosprintf).   Support for printf format strings in C++.
 @end direntry
+@end ifinfo
 
 @ifinfo
 This file provides documentation for GNU @code{autosprintf} library.
@@ -78,7 +84,7 @@ by the Free Software Foundation (FSF).
 A copy of the license is at @url{http://www.gnu.org/licenses/gpl.html}.
 @end titlepage
 
-@ifmakeinfo
+@ifset makeinfo
 @node Top, Introduction, (dir), (dir)
 @top GNU autosprintf
 
@@ -90,7 +96,7 @@ This manual documents the GNU autosprintf class, version @value{VERSION}.
 * Using autosprintf::           Using @code{autosprintf} in own programs
 @end menu
 
-@end ifnottex
+@end ifset
 
 @node Introduction, Class autosprintf, Top, Top
 @chapter Introduction