Started chapter06 indentation.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7323 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

3 files changed, 449 insertions, 357 deletions

diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml
index 5ba986652..5cecada9c 100644
--- a/chapter06/aboutdebug.xml
+++ b/chapter06/aboutdebug.xml
@@ -1,50 +1,53 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-aboutdebug">
-<title>About Debugging Symbols</title>
-<?dbhtml filename="aboutdebug.html"?>
-
-<para>Most programs and libraries are, by default, compiled with
-debugging symbols included (with <command>gcc</command>'s
-<parameter>-g</parameter> option). This means that when debugging a
-program or library that was compiled with debugging information
-included, the debugger can provide not only memory addresses, but also
-the names of the routines and variables.</para>
-
-<para>However, the inclusion of these debugging symbols enlarges a
-program or library significantly. The following is an example of the
-amount of space these symbols occupy:</para>
- 
-<itemizedlist>
-
-<listitem><para>a bash binary 
-with debugging symbols: 1200 KB</para></listitem>
-
-<listitem><para>a bash binary
-without debugging symbols: 480 KB</para></listitem>
-
-<listitem><para>Glibc and GCC files (<filename class="directory">/lib</filename>
-and <filename class="directory">/usr/lib</filename>)
-with debugging symbols: 87 MB</para></listitem>
 
-<listitem><para>Glibc and GCC files
-without debugging symbols: 16 MB</para></listitem>
-
-</itemizedlist>
-
-<para>Sizes may vary depending on which compiler and C
-library were used, but when comparing programs with and without debugging
-symbols, the difference will usually be a factor between two and
-five.</para>
-
-<para>Because most users will never use a debugger on their system
-software, a lot of disk space can be regained by removing these
-symbols. The next section shows how to strip all debugging symbols
-from the programs and libraries. Additional information on system
-optimization can be found at <ulink url="&hints-root;optimization.txt"/>.</para>
+<sect1 id="ch-system-aboutdebug">
+  <?dbhtml filename="aboutdebug.html"?>
+
+  <title>About Debugging Symbols</title>
+
+  <para>Most programs and libraries are, by default, compiled with
+  debugging symbols included (with <command>gcc</command>'s
+  <parameter>-g</parameter> option). This means that when debugging a
+  program or library that was compiled with debugging information
+  included, the debugger can provide not only memory addresses, but also
+  the names of the routines and variables.</para>
+
+  <para>However, the inclusion of these debugging symbols enlarges a
+  program or library significantly. The following is an example of the
+  amount of space these symbols occupy:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>A <command>bash</command> binary with debugging symbols:
+      1200 KB</para>
+    </listitem>
+    <listitem>
+      <para>A <command>bash</command> binary without debugging symbols:
+      480 KB</para>
+    </listitem>
+    <listitem>
+      <para>Glibc and GCC files (<filename class="directory">/lib</filename>
+      and <filename class="directory">/usr/lib</filename>) with debugging
+      symbols: 87 MB</para>
+    </listitem>
+    <listitem>
+      <para>Glibc and GCC files without debugging symbols: 16 MB</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>Sizes may vary depending on which compiler and C library were used,
+  but when comparing programs with and without debugging symbols, the
+  difference will usually be a factor between two and five.</para>
+
+  <para>Because most users will never use a debugger on their system software,
+  a lot of disk space can be regained by removing these symbols. The next
+  section shows how to strip all debugging symbols from the programs and
+  libraries. Additional information on system optimization can be found at
+  <ulink url="&hints-root;optimization.txt"/>.</para>
 
 </sect1>
-
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 4067d02d0..77dc301c7 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -1,143 +1,177 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-autoconf" role="wrap">
-<title>Autoconf-&autoconf-version;</title>
-<?dbhtml filename="autoconf.html"?>
+  <?dbhtml filename="autoconf.html"?>
+
+  <title>Autoconf-&autoconf-version;</title>
+
+  <indexterm zone="ch-system-autoconf">
+    <primary sortas="a-Autoconf">Autoconf</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-system-autoconf"><primary sortas="a-Autoconf">Autoconf</primary></indexterm>
+    <para>The Autoconf package contains programs for producing shell scripts that
+    can automatically configure source code.</para>
 
-<sect2 role="package"><title/>
-<para>The Autoconf package contains programs for producing shell scripts that
-can automatically configure source code.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.5 SBU</seg><seg>8.5 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.5 SBU</seg>
+        <seg>8.5 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Coreutils, Diffutils, Grep,
-M4, Make, Perl, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+    <segmentedlist>
+    <segtitle>&dependencies;</segtitle>
 
-<sect2 role="installation">
-<title>Installation of Autoconf</title>
+      <seglistitem>
+        <seg>Bash, Coreutils, Diffutils, Grep, M4, Make, Perl, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>Prepare Autoconf for compilation:</para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Autoconf</title>
+
+    <para>Prepare Autoconf for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>. This takes a long time, about 2 SBUs.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.
+    This takes a long time, about 2 SBUs.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
-
-<sect2 id="contents-autoconf" role="content"><title>Contents of Autoconf</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>autoconf, autoheader, autom4te,
-autoreconf, autoscan, autoupdate, and ifnames</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="autoconf">
-<term><command>autoconf</command></term>
-<listitem>
-<para>Produces shell scripts that automatically
-configure software source code packages to adapt to many kinds of
-Unix-like systems. The configuration scripts it produces are
-independent&mdash;running them does not require the <command>autoconf</command> program.</para>
-<indexterm zone="ch-system-autoconf autoconf"><primary sortas="b-autoconf">autoconf</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autoheader">
-<term><command>autoheader</command> </term>
-<listitem>
-<para>A tool for creating template files of C
-<emphasis>#define</emphasis> statements for configure to use</para>
-<indexterm zone="ch-system-autoconf autoheader"><primary sortas="b-autoheader">autoheader</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autom4te">
-<term><command>autom4te</command></term>
-<listitem>
-<para>A wrapper for the M4 macro processor</para>
-<indexterm zone="ch-system-autoconf autom4te"><primary sortas="b-autom4te">autom4te</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autoreconf">
-<term><command>autoreconf</command></term>
-<listitem>
-<para>Automatically runs <command>autoconf</command>,
-<command>autoheader</command>, <command>aclocal</command>,
-<command>automake</command>, <command>gettextize</command>, and
-<command>libtoolize</command> in the correct order to save time
-when changes are made to <command>autoconf</command> and 
-<command>automake</command> template files</para>
-<indexterm zone="ch-system-autoconf autoreconf"><primary sortas="b-autoreconf">autoreconf</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autoscan">
-<term><command>autoscan</command> </term>
-<listitem>
-<para>Helps to create a <filename>configure.in</filename> file for a
-software package; it examines the source files in a directory tree,
-searching them for common portability issues, and creates a
-<filename>configure.scan</filename> file that serves as as a
-preliminary <filename>configure.in</filename> file for the
-package</para>
-<indexterm zone="ch-system-autoconf autoscan"><primary sortas="b-autoscan">autoscan</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autoupdate">
-<term><command>autoupdate</command></term>
-<listitem>
-<para>Modifies a <filename>configure.in</filename> file that still
-calls <command>autoconf</command> macros by their old names to use the 
-current macro names</para>
-<indexterm zone="ch-system-autoconf autoupdate"><primary sortas="b-autoupdate">autoupdate</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ifnames">
-<term><command>ifnames</command> </term>
-<listitem>
-<para>Helps when writing <filename>configure.in</filename> files
-for a software package; it prints the identifiers that the package
-uses in C preprocessor conditionals. If a package has already been set
-up to have some portability, this program can help determine what
-<command>configure</command> needs to check for. It can also fill in
-gaps in a <filename>configure.in</filename> file generated by
-<command>autoscan</command></para>
-<indexterm zone="ch-system-autoconf ifnames"><primary sortas="b-ifnames">ifnames</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+  <sect2 id="contents-autoconf" role="content">
+    <title>Contents of Autoconf</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate,
+        and ifnames</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="autoconf">
+        <term><command>autoconf</command></term>
+        <listitem>
+          <para>Produces shell scripts that automatically configure software
+          source code packages to adapt to many kinds of Unix-like systems.
+          The configuration scripts it produces are independent&mdash;running
+          them does not require the <command>autoconf</command> program.</para>
+          <indexterm zone="ch-system-autoconf autoconf">
+            <primary sortas="b-autoconf">autoconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoheader">
+        <term><command>autoheader</command> </term>
+        <listitem>
+          <para>A tool for creating template files of C
+          <emphasis>#define</emphasis> statements for configure to use</para>
+          <indexterm zone="ch-system-autoconf autoheader">
+            <primary sortas="b-autoheader">autoheader</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autom4te">
+        <term><command>autom4te</command></term>
+        <listitem>
+          <para>A wrapper for the M4 macro processor</para>
+          <indexterm zone="ch-system-autoconf autom4te">
+            <primary sortas="b-autom4te">autom4te</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoreconf">
+        <term><command>autoreconf</command></term>
+        <listitem>
+          <para>Automatically runs <command>autoconf</command>,
+          <command>autoheader</command>, <command>aclocal</command>,
+          <command>automake</command>, <command>gettextize</command>, and
+          <command>libtoolize</command> in the correct order to save time
+          when changes are made to <command>autoconf</command> and
+          <command>automake</command> template files</para>
+          <indexterm zone="ch-system-autoconf autoreconf">
+            <primary sortas="b-autoreconf">autoreconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoscan">
+        <term><command>autoscan</command> </term>
+        <listitem>
+          <para>Helps to create a <filename>configure.in</filename> file for a
+          software package; it examines the source files in a directory tree,
+          searching them for common portability issues, and creates a
+          <filename>configure.scan</filename> file that serves as as a
+          preliminary <filename>configure.in</filename> file for the
+          package</para>
+          <indexterm zone="ch-system-autoconf autoscan">
+            <primary sortas="b-autoscan">autoscan</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoupdate">
+        <term><command>autoupdate</command></term>
+        <listitem>
+          <para>Modifies a <filename>configure.in</filename> file that still
+          calls <command>autoconf</command> macros by their old names to use the
+          current macro names</para>
+          <indexterm zone="ch-system-autoconf autoupdate">
+            <primary sortas="b-autoupdate">autoupdate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ifnames">
+        <term><command>ifnames</command> </term>
+        <listitem>
+          <para>Helps when writing <filename>configure.in</filename> files
+          for a software package; it prints the identifiers that the package
+          uses in C preprocessor conditionals. If a package has already been set
+          up to have some portability, this program can help determine what
+          <command>configure</command> needs to check for. It can also fill in
+          gaps in a <filename>configure.in</filename> file generated by
+          <command>autoscan</command></para>
+          <indexterm zone="ch-system-autoconf ifnames">
+            <primary sortas="b-ifnames">ifnames</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 71350a2db..884776983 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -1,217 +1,272 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-automake" role="wrap">
-<title>Automake-&automake-version;</title>
-<?dbhtml filename="automake.html"?>
+  <?dbhtml filename="automake.html"?>
+
+  <title>Automake-&automake-version;</title>
+
+  <indexterm zone="ch-system-automake">
+    <primary sortas="a-Automake">Automake</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-system-automake"><primary sortas="a-Automake">Automake</primary></indexterm>
+    <para>The Automake package contains programs for generating Makefiles for use
+    with Autoconf.</para>
 
-<sect2 role="package"><title/>
-<para>The Automake package contains programs for generating Makefiles for use
-with Autoconf.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>8.8 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.2 SBU</seg>
+        <seg>8.8 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Autoconf, Bash, Coreutils,
-Diffutils, Grep, M4, Make, Perl, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<sect2 role="installation">
-<title>Installation of Automake</title>
+      <seglistitem>
+        <seg>Autoconf, Bash, Coreutils, Diffutils, Grep, M4, Make, Perl,
+        and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>Prepare Automake for compilation:</para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Automake</title>
+
+    <para>Prepare Automake for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>. This takes a long time, about 5 SBUs.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.
+    This takes a long time, about 5 SBUs.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
-
-
-<sect2 id="contents-automake" role="content"><title>Contents of Automake</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>acinstall, aclocal, aclocal-&automake-version;,
-automake, automake-&automake-version;,
-compile, config.guess, config.sub, depcomp, elisp-comp, install-sh, mdate-sh, 
-missing, mkinstalldirs, py-compile, symlink-tree, and ylwrap</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="acinstall">
-<term><command>acinstall</command></term>
-<listitem>
-<para>A script that installs aclocal-style M4 files</para>
-<indexterm zone="ch-system-automake acinstall"><primary sortas="b-acinstall">acinstall</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="aclocal">
-<term><command>aclocal</command></term>
-<listitem>
-<para>Generates <filename>aclocal.m4</filename>
-files based on the contents of <filename>configure.in</filename> files</para>
-<indexterm zone="ch-system-automake aclocal"><primary sortas="b-aclocal">aclocal</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="aclocal-version">
-<term><command>aclocal-&automake-version;</command></term>
-<listitem>
-<para>A hard link to <command>aclocal</command></para>
-<indexterm zone="ch-system-automake aclocal-version"><primary
-sortas="b-aclocal-&automake-version;">aclocal-&automake-version;</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="automake">
-<term><command>automake</command></term>
-<listitem>
-<para>A tool for automatically generating
-<filename>Makefile.in</filename> files from
-<filename>Makefile.am</filename> files. To create all the
-<filename>Makefile.in</filename> files for a package, run this program
-in the top-level directory. By scanning the
-<filename>configure.in</filename> file, it automatically finds each
-appropriate <filename>Makefile.am</filename> file and generates the
-corresponding <filename>Makefile.in</filename> file</para>
-<indexterm zone="ch-system-automake automake"><primary sortas="b-automake">automake</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="automake-version">
-<term><command>automake-&automake-version;</command></term>
-<listitem>
-<para>A hard link to <command>automake</command></para>
-<indexterm zone="ch-system-automake automake-version"><primary
-sortas="b-automake-&automake-version;">automake-&automake-version;</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="compile">
-<term><command>compile</command></term>
-<listitem>
-<para>A wrapper for compilers</para>
-<indexterm zone="ch-system-automake compile"><primary sortas="b-compile">compile</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="config.guess">
-<term><command>config.guess</command></term>
-<listitem>
-<para>A script that attempts to guess
-the canonical triplet for the given build, host, or target architecture</para>
-<indexterm zone="ch-system-automake config.guess"><primary sortas="b-config.guess">config.guess</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="config.sub">
-<term><command>config.sub</command></term>
-<listitem>
-<para>A configuration validation subroutine script</para>
-<indexterm zone="ch-system-automake config.sub"><primary sortas="b-config.sub">config.sub</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="depcomp">
-<term><command>depcomp</command></term>
-<listitem>
-<para>A script for compiling a program so that dependency information
-is generated in addition to the desired output</para>
-<indexterm zone="ch-system-automake depcomp"><primary sortas="b-depcomp">depcomp</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="elisp-comp">
-<term><command>elisp-comp</command></term>
-<listitem>
-<para>Byte-compiles Emacs Lisp code</para>
-<indexterm zone="ch-system-automake elisp-comp"><primary sortas="b-elisp-comp">elisp-comp</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="install-sh">
-<term><command>install-sh</command></term>
-<listitem>
-<para>A script that installs a program, script, or data file</para>
-<indexterm zone="ch-system-automake install-sh"><primary sortas="b-install-sh">install-sh</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mdate-sh">
-<term><command>mdate-sh</command></term>
-<listitem>
-<para>A script that prints the modification time of a file or directory</para>
-<indexterm zone="ch-system-automake mdate-sh"><primary sortas="b-mdate-sh">mdate-sh</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="missing">
-<term><command>missing</command></term>
-<listitem>
-<para>A script acting as a common stub for missing GNU programs during
-an installation</para>
-<indexterm zone="ch-system-automake missing"><primary sortas="b-missing">missing</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mkinstalldirs">
-<term><command>mkinstalldirs</command></term>
-<listitem>
-<para>A script that creates a directory tree</para>
-<indexterm zone="ch-system-automake mkinstalldirs"><primary sortas="b-mkinstalldirs">mkinstalldirs</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="py-compile">
-<term><command>py-compile</command></term>
-<listitem>
-<para>Compiles a Python program</para>
-<indexterm zone="ch-system-automake py-compile"><primary sortas="b-py-compile">py-compile</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="symlink-tree">
-<term><command>symlink-tree</command></term>
-<listitem>
-<para>A script to create a symlink tree of a directory tree</para>
-<indexterm zone="ch-system-automake symlink-tree"><primary sortas="b-symlink-tree">symlink-tree</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ylwrap">
-<term><command>ylwrap</command></term>
-<listitem>
-<para>A wrapper for <command>lex</command> and <command>yacc</command></para>
-<indexterm zone="ch-system-automake ylwrap"><primary sortas="b-ylwrap">ylwrap</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+
+  <sect2 id="contents-automake" role="content">
+    <title>Contents of Automake</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>acinstall, aclocal, aclocal-&automake-version;, automake,
+        automake-&automake-version;, compile, config.guess, config.sub,
+        depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
+        py-compile, symlink-tree, and ylwrap</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="acinstall">
+        <term><command>acinstall</command></term>
+        <listitem>
+          <para>A script that installs aclocal-style M4 files</para>
+          <indexterm zone="ch-system-automake acinstall">
+            <primary sortas="b-acinstall">acinstall</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aclocal">
+        <term><command>aclocal</command></term>
+        <listitem>
+          <para>Generates <filename>aclocal.m4</filename> files based on the
+          contents of <filename>configure.in</filename> files</para>
+          <indexterm zone="ch-system-automake aclocal">
+            <primary sortas="b-aclocal">aclocal</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aclocal-version">
+        <term><command>aclocal-&automake-version;</command></term>
+        <listitem>
+          <para>A hard link to <command>aclocal</command></para>
+          <indexterm zone="ch-system-automake aclocal-version">
+            <primary sortas="b-aclocal-&automake-version;">aclocal-&automake-version;</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="automake">
+        <term><command>automake</command></term>
+        <listitem>
+          <para>A tool for automatically generating
+          <filename>Makefile.in</filename> files from
+          <filename>Makefile.am</filename> files. To create all the
+          <filename>Makefile.in</filename> files for a package, run this program
+          in the top-level directory. By scanning the
+          <filename>configure.in</filename> file, it automatically finds each
+          appropriate <filename>Makefile.am</filename> file and generates the
+          corresponding <filename>Makefile.in</filename> file</para>
+          <indexterm zone="ch-system-automake automake">
+            <primary sortas="b-automake">automake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="automake-version">
+        <term><command>automake-&automake-version;</command></term>
+        <listitem>
+          <para>A hard link to <command>automake</command></para>
+          <indexterm zone="ch-system-automake automake-version">
+            <primary sortas="b-automake-&automake-version;">automake-&automake-version;</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="compile">
+        <term><command>compile</command></term>
+        <listitem>
+          <para>A wrapper for compilers</para>
+          <indexterm zone="ch-system-automake compile">
+            <primary sortas="b-compile">compile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="config.guess">
+        <term><command>config.guess</command></term>
+        <listitem>
+          <para>A script that attempts to guess the canonical triplet for
+          the given build, host, or target architecture</para>
+          <indexterm zone="ch-system-automake config.guess">
+            <primary sortas="b-config.guess">config.guess</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="config.sub">
+        <term><command>config.sub</command></term>
+        <listitem>
+          <para>A configuration validation subroutine script</para>
+          <indexterm zone="ch-system-automake config.sub">
+            <primary sortas="b-config.sub">config.sub</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="depcomp">
+        <term><command>depcomp</command></term>
+        <listitem>
+          <para>A script for compiling a program so that dependency information
+          is generated in addition to the desired output</para>
+          <indexterm zone="ch-system-automake depcomp">
+            <primary sortas="b-depcomp">depcomp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="elisp-comp">
+        <term><command>elisp-comp</command></term>
+        <listitem>
+          <para>Byte-compiles Emacs Lisp code</para>
+          <indexterm zone="ch-system-automake elisp-comp">
+            <primary sortas="b-elisp-comp">elisp-comp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="install-sh">
+        <term><command>install-sh</command></term>
+        <listitem>
+          <para>A script that installs a program, script, or data file</para>
+          <indexterm zone="ch-system-automake install-sh">
+            <primary sortas="b-install-sh">install-sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mdate-sh">
+        <term><command>mdate-sh</command></term>
+        <listitem>
+          <para>A script that prints the modification time of a file or
+          directory</para>
+          <indexterm zone="ch-system-automake mdate-sh">
+            <primary sortas="b-mdate-sh">mdate-sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="missing">
+        <term><command>missing</command></term>
+        <listitem>
+          <para>A script acting as a common stub for missing GNU programs during
+          an installation</para>
+          <indexterm zone="ch-system-automake missing">
+            <primary sortas="b-missing">missing</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkinstalldirs">
+        <term><command>mkinstalldirs</command></term>
+        <listitem>
+          <para>A script that creates a directory tree</para>
+          <indexterm zone="ch-system-automake mkinstalldirs">
+            <primary sortas="b-mkinstalldirs">mkinstalldirs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="py-compile">
+        <term><command>py-compile</command></term>
+        <listitem>
+          <para>Compiles a Python program</para>
+          <indexterm zone="ch-system-automake py-compile">
+            <primary sortas="b-py-compile">py-compile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="symlink-tree">
+        <term><command>symlink-tree</command></term>
+        <listitem>
+          <para>A script to create a symlink tree of a directory tree</para>
+          <indexterm zone="ch-system-automake symlink-tree">
+            <primary sortas="b-symlink-tree">symlink-tree</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ylwrap">
+        <term><command>ylwrap</command></term>
+        <listitem>
+          <para>A wrapper for <command>lex</command> and
+          <command>yacc</command></para>
+          <indexterm zone="ch-system-automake ylwrap">
+            <primary sortas="b-ylwrap">ylwrap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-