Re: automake 1.8 manual indexes versus emacs info

[Alexandre Duret-Lutz]

>>> "Kevin" == Kevin Ryde <address@hidden> writes:

 Kevin> Emacs 21 Info-mode doesn't enjoy having the automake indexes in a
 Kevin> sub-node, as is the case in the automake 1.8 manual.  Pressing for
 Kevin> instance "i install" gives an error "No index".

 Kevin> I believe it needs to see menu entries like "Foo Index" or "Bar Index"
 Kevin> in the top-level node.

 Kevin> It's ok for them to be in a sub-node, just so long as there's menu
 Kevin> entries in the top-level, eg. in a "Detailed Node Listing" like the
 Kevin> autoconf manual does.

Thanks, I'm installing this on HEAD and branch-1-8.

2003-12-26  Alexandre Duret-Lutz  <address@hidden>

        * doc/automake.texi (@copying): Do not repeat the version.
        (Top): Use @insertcopying.  Add a @detailmenu, this works around
        Emacs 21's inability to lookup indices in sub-nodes (reported
        by Kevin Ryde).
        (C++ Support, Assembly Support, Fortran 77 Support, Java Support,
        Support for Other Languages, Preprocessing Fortran 77, Compiling
        Fortran 77 Files, Mixing Fortran 77 With C and C++, How the Linker
        is Chosen): Add missing descriptions in menus.
        (Fortran 77 and Autoconf): Remove, this node was just saying "use
        Autoconf 2.53 or greater".

Index: doc/automake.texi
===================================================================
RCS file: /cvs/automake/automake/doc/automake.texi,v
retrieving revision 1.19
diff -u -r1.19 automake.texi
--- doc/automake.texi   25 Dec 2003 18:15:25 -0000      1.19
+++ doc/automake.texi   26 Dec 2003 11:29:53 -0000
@@ -11,8 +11,7 @@
 
 This manual is for @acronym{GNU} Automake (version @value{VERSION},
 @value{UPDATED}), a program which creates GNU standards-compliant
-Makefiles from template files.  This edition documents version
address@hidden
+Makefiles from template files.
 
 Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 2003 Free Software Foundation, Inc.
@@ -81,9 +80,7 @@
 @comment  node-name,  next,  previous,  up
 @top GNU Automake
 
-This file documents the GNU Automake package.  Automake is a program
-which creates GNU standards-compliant Makefiles from template files.
-This edition documents version @value{VERSION}.
address@hidden
 
 @menu
 * Introduction::                Automake's purpose
@@ -114,6 +111,144 @@
 * FAQ::                         Frequently Asked Questions
 * Copying This Manual::         How to make copies of this manual
 * Indices::                     Indices of variables, macros, and concepts
+
address@hidden
+ --- The Detailed Node Listing ---
+
+General ideas
+
+* General Operation::           General operation of Automake
+* Strictness::                  Standards conformance checking
+* Uniform::                     The Uniform Naming Scheme
+* Canonicalization::            How derived variables are named
+* User Variables::              Variables reserved for the user
+* Auxiliary Programs::          Programs automake might require
+
+Some example packages
+
+* Complete::                    A simple example, start to finish
+* Hello::                       A classic program
+* true::                        Building true and false
+
+Scanning @file{configure.ac}
+
+* Requirements::                Configuration requirements
+* Optional::                    Other things Automake recognizes
+* Invoking aclocal::            Auto-generating aclocal.m4
+* aclocal options::             aclocal command line arguments
+* Macro search path::           Modifying aclocal's search path
+* Macros::                      Autoconf macros supplied with Automake
+* Extending aclocal::           Writing your own aclocal macros
+* Local Macros::                Organizing local macros
+* Future of aclocal::           aclocal's scheduled death
+
+Auto-generating aclocal.m4
+
+* aclocal options::             Options supported by aclocal
+* Macro search path::           How aclocal finds .m4 files
+
+Autoconf macros supplied with Automake
+
+* Public macros::               Macros that you can use.
+* Private macros::              Macros that you should not use.
+
+Building Programs and Libraries
+
+* A Program::                   Building a program
+* A Library::                   Building a library
+* A Shared Library::            Building a Libtool library
+* Program and Library Variables::  Variables controlling program and
+                                library builds
+* Default _SOURCES::            Default source files
+* LIBOBJS::                     Special handling for LIBOBJS and ALLOCA
+* Program variables::           Variables used when building a program
+* Yacc and Lex::                Yacc and Lex support
+* C++ Support::                 Compiling C++ sources
+* Assembly Support::            Compiling assembly sources
+* Fortran 77 Support::          Compiling Fortran 77 sources
+* Java Support::                Compiling Java sources
+* Support for Other Languages::  Compiling other languages
+* ANSI::                        Automatic de-ANSI-fication
+* Dependencies::                Automatic dependency tracking
+* EXEEXT::                      Support for executable extensions
+
+Building a program
+
+* Program Sources::             Defining program sources
+* Linking::                     Linking with libraries or extra objects
+* Conditional Sources::         Handling conditional sources
+* Conditional Programs::        Building program conditionally
+
+Building a Shared Library
+
+* Libtool Concept::             Introducing Libtool
+* Libtool Libraries::           Declaring Libtool Libraries
+* Conditional Libtool Libraries::  Building Libtool Libraries Conditionally
+* Conditional Libtool Sources::  Choosing Library Sources Conditionally
+* Libtool Convenience Libraries::  Building Convenience Libtool Libraries
+* Libtool Modules::             Building Libtool Modules
+* Libtool Flags::               Using _LIBADD and _LDFLAGS
+* LTLIBOBJ::                    Using $(LTLIBOBJ)
+* Libtool Issues::              Common Issues Related to Libtool's Use
+
+Fortran 77 Support
+
+* Preprocessing Fortran 77::    Preprocessing Fortran 77 sources
+* Compiling Fortran 77 Files::  Compiling Fortran 77 sources
+* Mixing Fortran 77 With C and C++::  Mixing Fortran 77 With C and C++
+
+Mixing Fortran 77 With C and C++
+
+* How the Linker is Chosen::    Automatic linker selection
+
+Other Derived Objects
+
+* Scripts::                     Executable scripts
+* Headers::                     Header files
+* Data::                        Architecture-independent data files
+* Sources::                     Derived sources
+
+Built sources
+
+* Built sources example::       Several ways to handle built sources.
+
+Other GNU Tools
+
+* Emacs Lisp::                  Emacs Lisp
+* gettext::                     Gettext
+* Libtool::                     Libtool
+* Java::                        Java
+* Python::                      Python
+
+Building documentation
+
+* Texinfo::                     Texinfo
+* Man pages::                   Man pages
+
+Miscellaneous Rules
+
+* Tags::                        Interfacing to etags and mkid
+* Suffixes::                    Handling new file extensions
+* Multilibs::                   Support for multilibs.
+
+Frequently Asked Questions about Automake
+
+* CVS::                         CVS and generated files
+* maintainer-mode::             missing and AM_MAINTAINER_MODE
+* wildcards::                   Why doesn't Automake support wildcards?
+* distcleancheck::              Files left in build directory after distclean
+* renamed objects::             Why are object files sometimes renamed?
+
+Copying This Manual
+
+* GNU Free Documentation License::  License for copying this manual
+
+Indices
+
+* Macro and Variable Index::    Index of Autoconf macros and Automake variables
+* General Index::               General index
+
address@hidden detailmenu
 @end menu
 
 @end ifnottex
@@ -2218,11 +2353,11 @@
 * LIBOBJS::                     Special handling for LIBOBJS and ALLOCA
 * Program variables::           Variables used when building a program
 * Yacc and Lex::                Yacc and Lex support
-* C++ Support::
-* Assembly Support::
-* Fortran 77 Support::
-* Java Support::
-* Support for Other Languages::
+* C++ Support::                 Compiling C++ sources
+* Assembly Support::            Compiling assembly sources
+* Fortran 77 Support::          Compiling Fortran 77 sources
+* Java Support::                Compiling Java sources
+* Support for Other Languages::  Compiling other languages
 * ANSI::                        Automatic de-ANSI-fication
 * Dependencies::                Automatic dependency tracking
 * EXEEXT::                      Support for executable extensions
@@ -3533,8 +3668,7 @@
 Any package including Fortran 77 code must define the output variable
 @samp{F77} in @file{configure.ac}; the simplest way to do this is to use
 the @code{AC_PROG_F77} macro (@pxref{Particular Programs, , Particular
-Program Checks, autoconf, The Autoconf Manual}).  @xref{Fortran 77 and
-Autoconf}.
+Program Checks, autoconf, The Autoconf Manual}).
 
 A few additional variables are defined when a Fortran 77 source file is
 seen:
@@ -3578,10 +3712,9 @@
 These issues are covered in the following sections.
 
 @menu
-* Preprocessing Fortran 77::
-* Compiling Fortran 77 Files::
-* Mixing Fortran 77 With C and C++::
-* Fortran 77 and Autoconf::
+* Preprocessing Fortran 77::    Preprocessing Fortran 77 sources
+* Compiling Fortran 77 Files::  Compiling Fortran 77 sources
+* Mixing Fortran 77 With C and C++::  Mixing Fortran 77 With C and C++
 @end menu
 
 
@@ -3707,7 +3840,7 @@
 
 @page
 @menu
-* How the Linker is Chosen::
+* How the Linker is Chosen::    Automatic linker selection
 @end menu
 
 @node How the Linker is Chosen
@@ -3761,16 +3894,6 @@
                         |         |         |         |
                         +---------+---------+---------+
 @end example
-
-
address@hidden Fortran 77 and Autoconf
address@hidden  node-name,  next,  previous,  up
address@hidden Fortran 77 and Autoconf
-
-The current Automake support for Fortran 77 requires a recent enough
-version of Autoconf that also includes support for Fortran 77.  Full
-Fortran 77 support was added to Autoconf 2.13, so you will want to use
-that version of Autoconf or later.
 
 
 @node Java Support
-- 
Alexandre Duret-Lutz