From 984ab5a1722ef03420e9de06aabbe8846ed9e785 Mon Sep 17 00:00:00 2001
From: Timothy Bauscher <timothy@linuxfromscratch.org>
Date: Wed, 15 Jan 2003 07:32:17 +0000
Subject: [PATCH] Converted static tar to new layout.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2328 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendixa/tar-dep.xml       |  2 ++
 appendixa/tar-shortdesc.xml | 11 +++++++++++
 chapter05/tar-inst.xml      | 24 ++++++++++++++++--------
 chapter05/tar.xml           |  4 ++--
 entities/tar.ent            |  1 +
 5 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 appendixa/tar-shortdesc.xml

diff --git a/appendixa/tar-dep.xml b/appendixa/tar-dep.xml
index 5136bf5eb..f689ac9b6 100644
--- a/appendixa/tar-dep.xml
+++ b/appendixa/tar-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Tar Installation Dependencies</title>
 
diff --git a/appendixa/tar-shortdesc.xml b/appendixa/tar-shortdesc.xml
new file mode 100644
index 000000000..70489e8e3
--- /dev/null
+++ b/appendixa/tar-shortdesc.xml
@@ -0,0 +1,11 @@
+<sect2><title>Contents of Tar</title>
+
+<para>Last checked against version &tar-contversion;.</para>
+
+<para>Tar is an archiving program designed to store and extract
+files from an archive file known as a tar file.</para>
+
+<sect3><title>Program Files</title>
+<para>rmt and tar</para></sect3>
+
+</sect2>
diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml
index 92060aaa4..5b7805e87 100644
--- a/chapter05/tar-inst.xml
+++ b/chapter05/tar-inst.xml
@@ -1,20 +1,28 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Tar</title>
 
-<para>To be able to directly use bzip2 files with tar, use the tar
-patch available from the LFS FTP site. This patch will add the -j option
-to tar which works the same as the -z option to tar (which can be used
-for gzip files).</para>
+<para>A patch may be applied to give tar direct support for
+bzip2 files. This patch adds the <emphasis>-j</emphasis> option
+to tar, which is similar to the <emphasis>-z</emphasis> option
+used for gzip files.</para>
 
 <para>Apply the patch by running the following command:</para>
 
 <para><screen><userinput>patch -Np1 -i ../tar-&tar-patch-version;.patch</userinput></screen></para>
 
-<para>Install Tar by running the following commands:</para>
+<para>Prepare Tar to be compiled:</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>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>Finish installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 0a4924233..55c993836 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &tar-time-static;
 Estimated required disk space:  &tar-compsize-static;</screen>
 
-&c5-tar-inst;
-&aa-tar-desc;
+&aa-tar-shortdesc;
 &aa-tar-dep;
+&c5-tar-inst;
 
 </sect1>
 
diff --git a/entities/tar.ent b/entities/tar.ent
index e8e5f111e..b060e88e0 100644
--- a/entities/tar.ent
+++ b/entities/tar.ent
@@ -10,6 +10,7 @@
 <!ENTITY aa-tar-desc SYSTEM "../appendixa/tar-desc.xml">
 <!ENTITY aa-tar-dep SYSTEM "../appendixa/tar-dep.xml">
 <!ENTITY aa-tar-down SYSTEM "../appendixa/tar-down.xml">
+<!ENTITY aa-tar-shortdesc SYSTEM "../appendixa/tar-shortdesc.xml">
 
 <!ENTITY tar-version "1.13">
 <!ENTITY tar-depversion "1.13">