Billy's autoconf conversion.

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

7 files changed, 37 insertions, 16 deletions

diff --git a/appendixa/autoconf-dep.xml b/appendixa/autoconf-dep.xml
index d91161aa4..90f6c9b6d 100644
--- a/appendixa/autoconf-dep.xml
+++ b/appendixa/autoconf-dep.xml
@@ -1,5 +1,6 @@
-<sect2>
-<title>Autoconf Installation Dependencies</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2><title>Autoconf Installation Dependencies</title>
 
 <para>Last checked against version &autoconf-depversion;.</para>
 
diff --git a/appendixa/autoconf-desc.xml b/appendixa/autoconf-desc.xml
index d038efbed..7e4efa00d 100644
--- a/appendixa/autoconf-desc.xml
+++ b/appendixa/autoconf-desc.xml
@@ -1,13 +1,9 @@
-<sect2><title>Contents of Autoconf</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &autoconf-contversion;.</para>
-
-<sect3><title>Program Files</title>
-<para>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate and 
-ifnames</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect2><title>Descriptions</title>
 
+<para>Last checked against version &autoconf-contversion;.</para>
+<sect3><title>Program file descriptions</title>
 <sect4><title>autoconf</title>
 <para>autoconf is a tool for producing shell scripts that automatically
 configure software source code packages to adapt to many kinds of
diff --git a/appendixa/autoconf-shortdesc.xml b/appendixa/autoconf-shortdesc.xml
new file mode 100644
index 000000000..2e2fa141d
--- /dev/null
+++ b/appendixa/autoconf-shortdesc.xml
@@ -0,0 +1,14 @@
+<sect2><title>Contents of Autoconf</title>
+
+<para>Last checked against version &autoconf-contversion;.</para>
+<para>
+  Autoconf produces shell scripts which automatically configure source
+  code.</para>
+
+<para>Autoconf installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate and 
+ifnames</para></sect3>
+
+</sect2>
diff --git a/appendixa/autoconf.xml b/appendixa/autoconf.xml
index 9b8488f6b..2a4d43758 100644
--- a/appendixa/autoconf.xml
+++ b/appendixa/autoconf.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="autoconf.html" dir="appendixa"?>
 
 &aa-autoconf-down;
+&aa-autoconf-shortdesc;
 &aa-autoconf-desc;
 &aa-autoconf-dep;
 
diff --git a/chapter06/autoconf-inst.xml b/chapter06/autoconf-inst.xml
index 1f7e7ce92..e4078e5aa 100644
--- a/chapter06/autoconf-inst.xml
+++ b/chapter06/autoconf-inst.xml
@@ -1,11 +1,19 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 <sect2>
 <title>Installation of Autoconf</title>
 
-<para>Install Autoconf by running the following commands:</para>
+<para>Prepare Autoconf to be compiled:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>
+./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 5d6652a17..0331a04c9 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -5,8 +5,8 @@
 <screen>Estimated build time:           &autoconf-time;
 Estimated required disk space:  &autoconf-compsize;</screen>
 
-&c6-autoconf-inst;
-&aa-autoconf-desc;
+&aa-autoconf-shortdesc;
 &aa-autoconf-dep;
+&c6-autoconf-inst;
 
 </sect1>
diff --git a/entities/autoconf.ent b/entities/autoconf.ent
index 7d58cbad8..c6a852918 100644
--- a/entities/autoconf.ent
+++ b/entities/autoconf.ent
@@ -4,6 +4,7 @@
 <!ENTITY c6-autoconf-inst SYSTEM "../chapter06/autoconf-inst.xml">
 
 <!ENTITY aa-autoconf SYSTEM "../appendixa/autoconf.xml">
+<!ENTITY aa-autoconf-shortdesc SYSTEM "../appendixa/autoconf-shortdesc.xml">
 <!ENTITY aa-autoconf-desc SYSTEM "../appendixa/autoconf-desc.xml">
 <!ENTITY aa-autoconf-dep SYSTEM "../appendixa/autoconf-dep.xml">
 <!ENTITY aa-autoconf-down SYSTEM "../appendixa/autoconf-down.xml">