From: Bruno Haible <bruno@clisp.org>
Date: Sun, 27 May 2007 21:07:56 +0000 (+0000)
Subject: Make it possible to use both texi2html and makeinfo for generating HTML doc.
X-Git-Tag: v0.17~382
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4e396765fee7aa4e8bdddb4311b68f10eb75fac;p=thirdparty%2Fgettext.git

Make it possible to use both texi2html and makeinfo for generating HTML doc.
---

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 21887289d..31d596a99 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-05  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.texi (ifmakeinfo): Remove alias.
+	(makeinfo): New variable.
+
 2007-05-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.texi (Overview of GNU gettext): Put @ifhtml outside @example,
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 0f479b500..0df894b28 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -1,11 +1,18 @@
 \input texinfo          @c -*-texinfo-*-
 @c %**start of header
 @setfilename gettext.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
-@c The @documentencoding is needed for makeinfo; texi2html accepts it as well.
+@ifnottex
+@ifclear texi2html
+@set makeinfo
+@end ifclear
+@end ifnottex
+@c The @documentencoding is needed for makeinfo; texi2html 1.52
+@c doesn't recognize it.
+@ifset makeinfo
 @documentencoding UTF-8
+@end ifset
 @settitle GNU @code{gettext} utilities
 @finalout
 @c Indices:
@@ -131,7 +138,7 @@ A copy of the license is included in @ref{GNU GPL}.
 @contents
 @end ifnottex
 
-@ifmakeinfo
+@ifset makeinfo
 @node Top, Introduction, (dir), (dir)
 @top GNU @code{gettext} utilities
 
@@ -461,7 +468,7 @@ Licenses
 @end detailmenu
 @end menu
 
-@end ifnottex
+@end ifset
 
 @node Introduction, Users, Top, Top
 @chapter Introduction