Eliminate texinfo 3.12 hacks.

5 files changed, 18 insertions, 93 deletions

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 871f980..485caa3 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-22  Andrew Cagney  <ac131313@redhat.com>
+
+	* gdb.texinfo: Remove makeinfo 3.12 hacks.
+	* gdbint.texinfo: Ditto.
+
 Tue Jan 22 11:57:38 2002  Andrew Cagney  <cagney@redhat.com>
 
 	* gdb.texinfo: Fix typo ``Remove' -> ``Remote''.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 93a3b40..076d166 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -33,7 +33,7 @@
 @c !!set GDB manual's revision date
 @set DATE December 2001
 
-@c THIS MANUAL REQUIRES TEXINFO 3.12 OR LATER.
+@c THIS MANUAL REQUIRES TEXINFO 4.0 OR LATER.
 
 @c This is a dir.info fragment to support semi-automated addition of
 @c manuals to an info tree.
@@ -105,7 +105,7 @@ development.''
 @end titlepage
 @page
 
-@ifinfo
+@ifnottex
 @node Top, Summary, (dir), (dir)
 
 @top Debugging with @value{GDBN}
@@ -158,69 +158,9 @@ Copyright (C) 1988-2002 Free Software Foundation, Inc.
 * Index::                       Index
 @end menu
 
-@end ifinfo
-
-@c the replication sucks, but this avoids a texinfo 3.12 lameness
-
-@ifhtml
-@node Top
-
-@top Debugging with @value{GDBN}
-
-This file describes @value{GDBN}, the @sc{gnu} symbolic debugger.
-
-This is the @value{EDITION} Edition, @value{DATE}, for @value{GDBN} Version
-@value{GDBVN}.
-
-Copyright (C) 1988-2000 Free Software Foundation, Inc.
-
-@menu
-* Summary::                     Summary of @value{GDBN}
-* Sample Session::              A sample @value{GDBN} session
+@end ifnottex
 
-* Invocation::                  Getting in and out of @value{GDBN}
-* Commands::                    @value{GDBN} commands
-* Running::                     Running programs under @value{GDBN}
-* Stopping::                    Stopping and continuing
-* Stack::                       Examining the stack
-* Source::                      Examining source files
-* Data::                        Examining data
-* Tracepoints::                 Debugging remote targets non-intrusively
-* Overlays::                    Debugging programs that use overlays
-
-* Languages::                   Using @value{GDBN} with different languages
-
-* Symbols::                     Examining the symbol table
-* Altering::                    Altering execution
-* GDB Files::                   @value{GDBN} files
-* Targets::                     Specifying a debugging target
-* Remote Debugging::            Debugging remote programs
-* Configurations::              Configuration-specific information
-* Controlling GDB::             Controlling @value{GDBN}
-* Sequences::                   Canned sequences of commands
-* TUI::                         @value{GDBN} Text User Interface
-* Emacs::                       Using @value{GDBN} under @sc{gnu} Emacs
-* Annotations::                 @value{GDBN}'s annotation interface.
-* GDB/MI::                      @value{GDBN}'s Machine Interface.
-
-* GDB Bugs::                    Reporting bugs in @value{GDBN}
-* Formatting Documentation::    How to format and print @value{GDBN} documentation
-
-* Command Line Editing::        Command Line Editing
-* Using History Interactively:: Using History Interactively
-* Installing GDB::              Installing GDB
-* Maintenance Commands::        Maintenance Commands
-* Remote Protocol::             GDB Remote Serial Protocol
-* GNU Free Documentation License::  The license for this documentation
-* Index::                       Index
-@end menu
-
-@end ifhtml
-
-@c TeX can handle the contents at the start but makeinfo 3.12 can not
-@iftex
 @contents
-@end iftex
 
 @node Summary
 @unnumbered Summary of @value{GDBN}
@@ -14906,12 +14846,4 @@ Example sequence of a target being stepped by a single instruction:
 % Blame: doc@cygnus.com, 1991.
 @end tex
 
-@c TeX can handle the contents at the start but makeinfo 3.12 can not
-@ifinfo
-@contents
-@end ifinfo
-@ifhtml
-@contents
-@end ifhtml
-
 @bye
diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index 3139cf0..a79ce97 100644
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -64,10 +64,7 @@ this GNU Manual, like GNU software.  Copies published by the Free
 Software Foundation raise funds for GNU development.''
 @end titlepage
 
-@c TeX can handle the contents at the start but makeinfo 3.12 can not
-@iftex
 @contents
-@end iftex
 
 @node Top
 @c Perhaps this should be the title of the document (but only for info,
@@ -5372,12 +5369,4 @@ exec.c
 
 @printindex cp
 
-@c TeX can handle the contents at the start but makeinfo 3.12 can not
-@ifinfo
-@contents
-@end ifinfo
-@ifhtml
-@contents
-@end ifhtml
-
 @bye
diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index 19a5656..282b342 100644
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,4 +1,8 @@
-2002-01-13  Andrew Cagney  <ac131313@redhat.com>
+2002-01-22  Andrew Cagney  <ac131313@redhat.com>
+
+	* gdbmi.texinfo: Remove makeinfo 3.12 hacks.
+
+2002-01-21  Andrew Cagney  <ac131313@redhat.com>
 
 	* mi-cmd-stack.c: Remove #else clause of #ifdef UI_OUT.
 	* mi-cmd-break.c: Ditto.
diff --git a/gdb/mi/gdbmi.texinfo b/gdb/mi/gdbmi.texinfo
index 1148427..0a4fe3b 100644
--- a/gdb/mi/gdbmi.texinfo
+++ b/gdb/mi/gdbmi.texinfo
@@ -109,6 +109,11 @@ Elena Zannoni.
 * GDB/MI Data Manipulation::
 * GDB/MI Program Control::
 * GDB/MI Miscellaneous Commands::
+@ignore
+* GDB/MI Kod Commands::
+* GDB/MI Memory Overlay Commands::
+* GDB/MI Signal Handling Commands::
+@end ignore
 * GDB/MI Stack Manipulation::
 * GDB/MI Symbol Query::
 * GDB/MI Target Manipulation::
@@ -117,16 +122,6 @@ Elena Zannoni.
 * GDB/MI Variable Objects::
 @end menu
 
-@c When these are implemented, they should be moved to be between Misc and
-@c Stack Manipulation in the above menu.  They are now outside the menu
-@c because makeinfo 3.12 barfs if it sees @ignore or @comments in the
-@c middle of a menu.
-@ignore
-* GDB/MI Kod Commands::
-* GDB/MI Memory Overlay Commands::
-* GDB/MI Signal Handling Commands::
-@end ignore
-
 @c %%%%%%%%%%%%%%%%%%%%%%%%%%%% SECTION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 @node GDB/MI Command Syntax
 @section @sc{gdb/mi} Command Syntax