converted gzip, make and patch

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

7 files changed, 55 insertions, 33 deletions

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>