From: Bruno Haible <bruno@clisp.org>
Date: Thu, 3 May 2007 22:59:50 +0000 (+0000)
Subject: Add support for both "makeinfo --html" and texi2html.
X-Git-Tag: v0.17~416
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b5813da807e65ba1ea15a6920791114231bb3d2;p=thirdparty%2Fgettext.git

Add support for both "makeinfo --html" and texi2html.
---

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 40e1dbf5e..d7b831957 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-03  Bruno Haible  <bruno@clisp.org>
+
+	Add support for both "makeinfo --html" and texi2html.
+	* autosprintf.texi (ifmakeinfo): New alias.
+	(Top): Use it instead of @ifinfo.
+
 2007-04-06  Bruno Haible  <bruno@clisp.org>
 
 	* printf-args.h: Assume HAVE_LONG_DOUBLE to be true.
diff --git a/gettext-runtime/libasprintf/autosprintf.texi b/gettext-runtime/libasprintf/autosprintf.texi
index 7543cde18..383c0c266 100644
--- a/gettext-runtime/libasprintf/autosprintf.texi
+++ b/gettext-runtime/libasprintf/autosprintf.texi
@@ -1,6 +1,9 @@
 \input texinfo          @c -*-texinfo-*-
 @c %**start of header
 @setfilename autosprintf.info
+@c The @ifmakeinfo ... @end ifnottex conditional evaluates to true in makeinfo
+@c for info and html output, but to false in texi2html.
+@alias ifmakeinfo = ifnottex
 @settitle GNU @code{autosprintf}
 @finalout
 @c Indices:
@@ -75,7 +78,7 @@ by the Free Software Foundation (FSF).
 A copy of the license is at @url{http://www.gnu.org/licenses/gpl.html}.
 @end titlepage
 
-@ifinfo
+@ifmakeinfo
 @node Top, Introduction, (dir), (dir)
 @top GNU autosprintf
 
@@ -87,7 +90,7 @@ This manual documents the GNU autosprintf class, version @value{VERSION}.
 * Using autosprintf::           Using @code{autosprintf} in own programs
 @end menu
 
-@end ifinfo
+@end ifnottex
 
 @node Introduction, Class autosprintf, Top, Top
 @chapter Introduction
diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 641b566cc..6bca4c8d9 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-03  Bruno Haible  <bruno@clisp.org>
+
+	Add support for both "makeinfo --html" and texi2html.
+	* gettext.texi (ifmakeinfo): New alias.
+	(Top): Use it instead of @ifinfo.
+
 2007-05-03  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.texi (Bug Report Address): Fix cross references.
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 197edf932..a259e2092 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -1,10 +1,13 @@
 \input texinfo          @c -*-texinfo-*-
 @c %**start of header
-@c The @documentencoding is needed for makeinfo, but not for texi2html.
-@c @ifhtml
-@c @documentencoding UTF-8
-@c @end ifhtml
 @setfilename gettext.info
+@c The @ifmakeinfo ... @end ifnottex conditional evaluates to true in makeinfo
+@c for info and html output, but to false in texi2html.
+@alias ifmakeinfo = ifnottex
+@c The @documentencoding is needed for makeinfo, but not for texi2html.
+@ifmakeinfo
+@documentencoding UTF-8
+@end ifnottex
 @settitle GNU @code{gettext} utilities
 @finalout
 @c Indices:
@@ -130,7 +133,7 @@ A copy of the license is included in @ref{GNU GPL}.
 @contents
 @end ifnottex
 
-@ifinfo
+@ifmakeinfo
 @node Top, Introduction, (dir), (dir)
 @top GNU @code{gettext} utilities
 
@@ -460,7 +463,7 @@ Licenses
 @end detailmenu
 @end menu
 
-@end ifinfo
+@end ifnottex
 
 @node Introduction, Users, Top, Top
 @chapter Introduction