summaryrefslogtreecommitdiffstats
path: root/gettext-tools/doc
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2007-05-27 21:07:56 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:14:50 +0200
commite4e396765fee7aa4e8bdddb4311b68f10eb75fac (patch)
treefc065bd81a7dbb0a2398557c2ebd892b971eff18 /gettext-tools/doc
parent6decf7faeb6c6e34eba3c5afec4f3034ed54f443 (diff)
downloadexternal_gettext-e4e396765fee7aa4e8bdddb4311b68f10eb75fac.zip
external_gettext-e4e396765fee7aa4e8bdddb4311b68f10eb75fac.tar.gz
external_gettext-e4e396765fee7aa4e8bdddb4311b68f10eb75fac.tar.bz2
Make it possible to use both texi2html and makeinfo for generating HTML doc.
Diffstat (limited to 'gettext-tools/doc')
-rw-r--r--gettext-tools/doc/ChangeLog5
-rw-r--r--gettext-tools/doc/gettext.texi17
2 files changed, 17 insertions, 5 deletions
diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 2188728..31d596a 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 0f479b5..0df894b 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