From a1d1a356a847bc939fec1f0e890823a768090567 Mon Sep 17 00:00:00 2001
From: Timothy Bauscher <timothy@linuxfromscratch.org>
Date: Wed, 15 Jan 2003 07:45:14 +0000
Subject: Converted static texinfo to new layout.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2329 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendixa/texinfo-dep.xml       |  2 ++
 appendixa/texinfo-shortdesc.xml | 13 +++++++++++++
 chapter05/texinfo-inst.xml      | 14 ++++++++++----
 chapter05/texinfo.xml           |  4 ++--
 entities/texinfo.ent            |  1 +
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 appendixa/texinfo-shortdesc.xml

diff --git a/appendixa/texinfo-dep.xml b/appendixa/texinfo-dep.xml
index d2ed4e9ba..769b514ad 100644
--- a/appendixa/texinfo-dep.xml
+++ b/appendixa/texinfo-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Texinfo Installation Dependencies</title>
 
diff --git a/appendixa/texinfo-shortdesc.xml b/appendixa/texinfo-shortdesc.xml
new file mode 100644
index 000000000..562bd807f
--- /dev/null
+++ b/appendixa/texinfo-shortdesc.xml
@@ -0,0 +1,13 @@
+<sect2><title>Contents of Texinfo</title>
+
+<para>Last checked against version &texinfo-contversion;.</para>
+
+<para>The Texinfo package contains programs used for reading,
+writing and converting Info documents, which provide system
+documentation.</para>
+
+<sect3><title>Program Files</title>
+<para>info, infokey, install-info, makeinfo, texi2dvi and
+texindex</para></sect3>
+
+</sect2>
diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml
index e5db2dcba..83ff699a3 100644
--- a/chapter05/texinfo-inst.xml
+++ b/chapter05/texinfo-inst.xml
@@ -1,12 +1,18 @@
 <sect2>
 <title>Installation of Texinfo</title>
 
-<para>Install Texinfo by running the following commands:</para>
+<para>Prepare Texinfo to be compiled:</para>
 
 <para><screen><userinput>LDFLAGS="-static" ./configure --prefix=$LFS/static \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--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/texinfo.xml b/chapter05/texinfo.xml
index 6c6027d45..fdbf5f83c 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &texinfo-time-static;
 Estimated required disk space:  &texinfo-compsize-static;</screen>
 
-&c5-texinfo-inst;
-&aa-texinfo-desc;
+&aa-texinfo-shortdesc;
 &aa-texinfo-dep;
+&c5-texinfo-inst;
 
 </sect1>
 
diff --git a/entities/texinfo.ent b/entities/texinfo.ent
index 41a919f4e..1bc41feb6 100644
--- a/entities/texinfo.ent
+++ b/entities/texinfo.ent
@@ -11,6 +11,7 @@
 <!ENTITY aa-texinfo-desc SYSTEM "../appendixa/texinfo-desc.xml">
 <!ENTITY aa-texinfo-dep SYSTEM "../appendixa/texinfo-dep.xml">
 <!ENTITY aa-texinfo-down SYSTEM "../appendixa/texinfo-down.xml">
+<!ENTITY aa-texinfo-shortdesc SYSTEM "../appendixa/texinfo-shortdesc.xml">
 
 <!ENTITY texinfo-version "4.3">
 <!ENTITY texinfo-depversion "4.0">
-- 
cgit v1.2.3-54-g00ecf