Billy's automake conversion.

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

appendixa/automake-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Automake Installation Dependencies</title>
 

appendixa/automake-desc.xml

@@ -1,13 +1,10 @@
-<sect2><title>Contents of Automake</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2><title>Descriptions</title>
 
 <para>Last checked against version &automake-contversion;.</para>
 
-<sect3><title>Program Files</title>
+<sect3><title>Program file descriptions</title>
-<para>acinstall, aclocal, aclocal-1.6, automake, automake-1.6,
-compile, config.guess, config.sub, depcomp, elisp-comp, install-sh,
-mdate-sh, missing, mkinstalldirs, py-compile, ylwrap</para></sect3>
-
-<sect3><title>Descriptions</title>
 
 <sect4><title>acinstall</title>
 <para>acinstall is a script which installs aclocal-style M4 files.</para></sect4>
@@ -25,10 +22,11 @@ Also, the aclocal mechanism is extensible for use
 by other packages.</para></sect4>
 
 <sect4><title>automake, automake-1.6</title>
-<para>To create all the Makefile.in's for a package, run the automake
+<para>To create all the Makefile.in files for a package, run the
-program in the top level directory, with no arguments. automake will
+automake program in the top level directory, with no
-automatically find each appropriate Makefile.am (by scanning
+arguments. automake will automatically find each appropriate
-configure.in) and generate the corresponding Makefile.in.</para></sect4>
+Makefile.am (by scanning configure.in) and generate the corresponding
+Makefile.in.</para></sect4> 
 
 <sect4><title>compile</title>
 <para>compile is script which acts as a wrapper for compilers.</para></sect4>

appendixa/automake-shortdesc.xml

@@ -0,0 +1,13 @@
+<sect2><title>Contents of Automake</title>
+
+<para>Last checked against version &automake-contversion;.</para>
+
+<para>Automake generates Makefile.in files, intended for use with Autoconf.</para>
+<para>Modutils installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>acinstall, aclocal, aclocal-1.6, automake, automake-1.6,
+compile, config.guess, config.sub, depcomp, elisp-comp, install-sh,
+mdate-sh, missing, mkinstalldirs, py-compile, ylwrap</para></sect3>
+
+</sect2>

appendixa/automake.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="automake.html" dir="appendixa"?>
 
 &aa-automake-down;
+&aa-automake-shortdesc;
 &aa-automake-desc;
 &aa-automake-dep;
 

chapter06/automake-inst.xml

@@ -1,11 +1,20 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Automake</title>
 
-<para>Install Automake by running the following commands:</para>
+<para>Prepare Automake to be compiled:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>
-make install &amp;&amp;
+./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling and installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Create necessary symbolic link:</para>
+
+<para><screen><userinput>
 ln -s automake-1.7 /usr/share/automake</userinput></screen></para>
 
 </sect2>
-

chapter06/automake.xml

@@ -5,8 +5,8 @@
 <screen>Estimated build time:           &automake-time;
 Estimated required disk space:  &automake-compsize;</screen>
 
-&c6-automake-inst;
+&aa-automake-shortdesc;
-&aa-automake-desc;
 &aa-automake-dep;
+&c6-automake-inst;
 
 </sect1>

entities/automake.ent

@@ -4,6 +4,7 @@
 <!ENTITY c6-automake-inst SYSTEM "../chapter06/automake-inst.xml">
 
 <!ENTITY aa-automake SYSTEM "../appendixa/automake.xml">
+<!ENTITY aa-automake-shortdesc SYSTEM "../appendixa/automake-shortdesc.xml">
 <!ENTITY aa-automake-desc SYSTEM "../appendixa/automake-desc.xml">
 <!ENTITY aa-automake-dep SYSTEM "../appendixa/automake-dep.xml">
 <!ENTITY aa-automake-down SYSTEM "../appendixa/automake-down.xml">