converted gzip, make and patch

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

19 files changed, 122 insertions, 53 deletions

diff --git a/appendixa/gzip-dep.xml b/appendixa/gzip-dep.xml
index 0b7c7258e..02c4b481b 100644
--- a/appendixa/gzip-dep.xml
+++ b/appendixa/gzip-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Gzip Installation Dependencies</title>
 
diff --git a/appendixa/gzip-desc.xml b/appendixa/gzip-desc.xml
index 3faab5899..d3070849d 100644
--- a/appendixa/gzip-desc.xml
+++ b/appendixa/gzip-desc.xml
@@ -1,13 +1,10 @@
-<sect2><title>Contents of Gzip</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &gzip-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>gunzip (link to gzip), gzexe, gzip,
-uncompress (link to gunzip), zcat (link to gzip), zcmp, zdiff, zforce,
-zgrep, zmore and znew</para></sect3>
+<para>Last checked against version &gzip-contversion;.</para>
 
-<sect3><title>Description</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>gunzip, uncompress</title>
 <para>gunzip and uncompress decompress files which are compressed with 
diff --git a/appendixa/gzip-shortdesc.xml b/appendixa/gzip-shortdesc.xml
new file mode 100644
index 000000000..109144cb9
--- /dev/null
+++ b/appendixa/gzip-shortdesc.xml
@@ -0,0 +1,15 @@
+<sect2><title>Contents of Gzip</title>
+
+<para>Last checked against version &gzip-contversion;.</para>
+
+<para>The gzip package contains program to compress and decompress files
+using the Lempel-Ziv coding (LZ77).</para>
+
+<para>Gzip installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>gunzip (link to gzip), gzexe, gzip,
+uncompress (link to gunzip), zcat (link to gzip), zcmp, zdiff, zforce,
+zgrep, zmore and znew</para></sect3>
+
+</sect2>
diff --git a/appendixa/make-dep.xml b/appendixa/make-dep.xml
index 052efc816..3bab6f4ed 100644
--- a/appendixa/make-dep.xml
+++ b/appendixa/make-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Make Installation Dependencies</title>
 
diff --git a/appendixa/make-desc.xml b/appendixa/make-desc.xml
index 12798845e..4df8ae26d 100644
--- a/appendixa/make-desc.xml
+++ b/appendixa/make-desc.xml
@@ -1,15 +1,14 @@
-<sect2><title>Contents of Make</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &make-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program files</title>
-<para>make</para></sect3>
+<para>Last checked against version &make-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>make</title>
-<para>make determines, automatically, which pieces of a large program need to be 
-recompiled and issues the commands to recompile them.</para></sect4>
+<para>make determines, automatically, which pieces of a large program need
+to be recompiled and issues the commands to recompile them.</para></sect4>
 
 </sect3>
 
diff --git a/appendixa/make-shortdesc.xml b/appendixa/make-shortdesc.xml
new file mode 100644
index 000000000..6983ca038
--- /dev/null
+++ b/appendixa/make-shortdesc.xml
@@ -0,0 +1,14 @@
+<sect2><title>Contents of Make</title>
+
+<para>Last checked against version &make-contversion;.</para>
+
+<para>Make determines, automatically, which pieces of a large program need
+to be recompiled and issues the commands to recompile them.</para>
+
+<para>Make installs the following:</para>
+
+<sect3><title>Program files</title>
+<para>make</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/patch-dep.xml b/appendixa/patch-dep.xml
index 8d46164e4..7bb660007 100644
--- a/appendixa/patch-dep.xml
+++ b/appendixa/patch-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Patch Installation Dependencies</title>
 
diff --git a/appendixa/patch-desc.xml b/appendixa/patch-desc.xml
index 303ebb9f7..703f22044 100644
--- a/appendixa/patch-desc.xml
+++ b/appendixa/patch-desc.xml
@@ -1,11 +1,10 @@
-<sect2><title>Contents of Patch</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &patch-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>patch</para></sect3>
+<para>Last checked against version &patch-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program files descriptions</title>
 
 <sect4><title>patch</title>
 <para>The patch program modifies a file according to a patch file. A patch
diff --git a/appendixa/patch-shortdesc.xml b/appendixa/patch-shortdesc.xml
new file mode 100644
index 000000000..00f9d9610
--- /dev/null
+++ b/appendixa/patch-shortdesc.xml
@@ -0,0 +1,15 @@
+<sect2><title>Contents of Patch</title>
+
+<para>Last checked against version &patch-contversion;.</para>
+
+<para>The patch program modifies a file according to a patch file. A patch
+file usually is a list, created by the diff program, that contains
+instructions on how an original file needs to be modified.</para>
+
+<para>Make installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>patch</para></sect3>
+
+</sect2>
+
diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml
index e7828b436..77737e234 100644
--- a/chapter05/gzip-inst.xml
+++ b/chapter05/gzip-inst.xml
@@ -1,11 +1,19 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Gzip</title>
 
-<para>Install Gzip by running the following commands:</para>
+<para>Prepare Gzip to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=$LFS/static</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make LDFLAGS="-static"</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/static &amp;&amp;
-make LDFLAGS="-static" &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 9ae7efa96..6d608ceb1 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &gzip-time-static;
 Estimated required disk space:  &gzip-compsize-static;</screen>
 
-&c5-gzip-inst;
-&aa-gzip-desc;
+&aa-gzip-shortdesc;
 &aa-gzip-dep;
+&c5-gzip-inst;
 
 </sect1>
 
diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml
index 8f91baa6a..5efe572a3 100644
--- a/chapter05/make-inst.xml
+++ b/chapter05/make-inst.xml
@@ -1,11 +1,19 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Make</title>
 
-<para>Install Make by running the following commands:</para>
+<para>Prepare Make to be compiled:</para>
+
+<para><screen><userinput>LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls</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>LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 <para>During the make install phase you will see this warning:</para>
 
@@ -14,10 +22,10 @@ make install</userinput></screen></para>
 otherwise the `-l' option will probably not work. You may need special
 privileges to complete the installation of /mnt/lfs/static/bin/make.</screen></blockquote>
 
-<para>You can safely ignore this warning. The make program doesn't actually need to be owned by
-group kmem and setgid for the <emphasis>-l</emphasis> option to work. (This option
-tells make not to start any new jobs when a certain load on
-the system has been reached.)</para>
+<para>You can safely ignore this warning. The make program doesn't actually
+need to be owned by group kmem and setgid for the <emphasis>-l</emphasis>
+option to work. (This option tells make not to start any new jobs when a
+certain load on the system has been reached.)</para>
 
 </sect2>
 
diff --git a/chapter05/make.xml b/chapter05/make.xml
index 4e4f2ca34..ebb9331bb 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &make-time-static;
 Estimated required disk space:  &make-compsize-static;</screen>
 
-&c5-make-inst;
-&aa-make-desc;
+&aa-make-shortdesc;
 &aa-make-dep;
+&c5-make-inst;
 
 </sect1>
 
diff --git a/chapter05/patch-exp.xml b/chapter05/patch-exp.xml
deleted file mode 100644
index ed90304af..000000000
--- a/chapter05/patch-exp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>CPPFLAGS=-D_GNU_SOURCE: </userinput>
-This flag fixes installation problems of this package on PPC and m68k
-platforms (that we know of). It doesn't hurt compilation on other
-platforms, such as x86, so we do it by default.</para>
-
-</sect2>
-
diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml
index 9142a23bf..9f9467b2b 100644
--- a/chapter05/patch-inst.xml
+++ b/chapter05/patch-inst.xml
@@ -1,12 +1,29 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Patch</title>
 
-<para>Install Patch by running the following commands:</para>
+<para>Prepare Patch to be compiled:</para>
 
 <para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
-&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static</userinput></screen></para>
+
+<para>The meaning of the configure option is:</para>
+
+<itemizedlist>
+<listitem><para><userinput>CPPFLAGS=-D_GNU_SOURCE:</userinput> This flag
+fixes installation problems of this package on PPC and m68k platforms (that
+we know of). It doesn't hurt compilation on other platforms, such as x86,
+so we do it by default.</para></listitem>
+</itemizedlist>
+
+<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/chapter05/patch.xml b/chapter05/patch.xml
index f0a5007fe..c8d6b8d65 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -5,10 +5,9 @@
 <screen>Estimated build time:           &patch-time-static;
 Estimated required disk space:  &patch-compsize-static;</screen>
 
-&c5-patch-inst;
-&c5-patch-exp;
-&aa-patch-desc;
+&aa-patch-shortdesc;
 &aa-patch-dep;
+&c5-patch-inst;
 
 </sect1>
 
diff --git a/entities/gzip.ent b/entities/gzip.ent
index 5d964958f..44e5e4b2d 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -9,6 +9,7 @@
 <!ENTITY c6-gzip-exp SYSTEM "../chapter06/gzip-exp.xml">
 
 <!ENTITY aa-gzip SYSTEM "../appendixa/gzip.xml">
+<!ENTITY aa-gzip-shortdesc SYSTEM "../appendixa/gzip-shortdesc.xml">
 <!ENTITY aa-gzip-desc SYSTEM "../appendixa/gzip-desc.xml">
 <!ENTITY aa-gzip-dep SYSTEM "../appendixa/gzip-dep.xml">
 <!ENTITY aa-gzip-down SYSTEM "../appendixa/gzip-down.xml">
diff --git a/entities/make.ent b/entities/make.ent
index 778d5c0c7..f8aebcde8 100644
--- a/entities/make.ent
+++ b/entities/make.ent
@@ -8,6 +8,7 @@
 <!ENTITY c6-make-exp SYSTEM "../chapter06/make-exp.xml">
 
 <!ENTITY aa-make SYSTEM "../appendixa/make.xml">
+<!ENTITY aa-make-shortdesc SYSTEM "../appendixa/make-shortdesc.xml">
 <!ENTITY aa-make-desc SYSTEM "../appendixa/make-desc.xml">
 <!ENTITY aa-make-dep SYSTEM "../appendixa/make-dep.xml">
 <!ENTITY aa-make-down SYSTEM "../appendixa/make-down.xml">
diff --git a/entities/patch.ent b/entities/patch.ent
index 587e69960..14c3ce1f3 100644
--- a/entities/patch.ent
+++ b/entities/patch.ent
@@ -2,12 +2,12 @@
 
 <!ENTITY c5-patch SYSTEM "../chapter05/patch.xml">
 <!ENTITY c5-patch-inst SYSTEM "../chapter05/patch-inst.xml">
-<!ENTITY c5-patch-exp SYSTEM "../chapter05/patch-exp.xml">
 
 <!ENTITY c6-patch SYSTEM "../chapter06/patch.xml">
 <!ENTITY c6-patch-inst SYSTEM "../chapter06/patch-inst.xml">
 
 <!ENTITY aa-patch SYSTEM "../appendixa/patch.xml">
+<!ENTITY aa-patch-shortdesc SYSTEM "../appendixa/patch-shortdesc.xml">
 <!ENTITY aa-patch-desc SYSTEM "../appendixa/patch-desc.xml">
 <!ENTITY aa-patch-dep SYSTEM "../appendixa/patch-dep.xml">
 <!ENTITY aa-patch-down SYSTEM "../appendixa/patch-down.xml">