c6-perl conversion patch by Billy

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

6 files changed, 24 insertions, 19 deletions

diff --git a/appendixa/perl-dep.xml b/appendixa/perl-dep.xml
index 97c7cf54d..4614cb32d 100644
--- a/appendixa/perl-dep.xml
+++ b/appendixa/perl-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Perl Installation Dependencies</title>
 
diff --git a/appendixa/perl-desc.xml b/appendixa/perl-desc.xml
index 57197a31b..6dac747ee 100644
--- a/appendixa/perl-desc.xml
+++ b/appendixa/perl-desc.xml
@@ -1,13 +1,10 @@
-<sect2><title>Contents of Perl</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &perl-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>a2p, c2ph, dprofpp, find2perl, h2ph, h2xs, perl, perl5.6.1,
-perlbug, perlcc, perldoc, pl2pm, pod2html, pod2latex, pod2man, pod2text,
-pod2usage, podchecker, podselect, pstruct, s2p and splain</para></sect3>
+<para>Last checked against version &perl-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>a2p</title>
 <para>a2p is an awk to perl translator.</para></sect4>
@@ -85,12 +82,7 @@ in perl.</para></sect4>
 
 </sect3>
 
-<sect3><title>Library Files</title>
-<para>attrs.so, B.so, ByteLoader.so, DProf.so, Dumper.so, DynaLoader.a,
-Fcntl.so, Glob.so, Hostname.so, IO.so, libperl.a, Opcode.so, Peek.so,
-POSIX.so, re.so, SDBM_File.so, Socket.so, Syslog.so and SysV.so</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Library file descriptions</title>
 
 <sect4><title>attrs</title>
 <para>No description is currently available.</para></sect4>
diff --git a/appendixa/perl.xml b/appendixa/perl.xml
index 6bf346048..124c02707 100644
--- a/appendixa/perl.xml
+++ b/appendixa/perl.xml
@@ -3,6 +3,7 @@
 <?dbhtml filename="perl.html" dir="appendixa"?>
 
 &aa-perl-down;
+&aa-perl-shortdesc;
 &aa-perl-desc;
 &aa-perl-dep;
 
diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml
index eefcfc8cd..cfcd8488b 100644
--- a/chapter06/perl-inst.xml
+++ b/chapter06/perl-inst.xml
@@ -1,11 +1,20 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 <sect2>
 <title>Installation of Perl</title>
 
-<para>Install Perl by running the following commands:</para>
 
-<para><screen><userinput>./configure.gnu --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+
+<para>Prepare Perl to be compiled:</para>
+
+<para><screen><userinput>./configure.gnu --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>
 
 <para>If you want more control over the way perl sets itself up to be
 built, you can run the interactive <userinput>Configure</userinput> script
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 5a56590ef..8528e6149 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &perl-time;
 Estimated required disk space:  &perl-compsize;</screen>
 
-&c6-perl-inst;
-&aa-perl-desc;
+&aa-perl-shortdesc;
 &aa-perl-dep;
+&c6-perl-inst;
 
 </sect1>
 
diff --git a/entities/perl.ent b/entities/perl.ent
index c55123ec9..7e9956698 100644
--- a/entities/perl.ent
+++ b/entities/perl.ent
@@ -5,6 +5,7 @@
 <!ENTITY c6-perl-inst SYSTEM "../chapter06/perl-inst.xml">
 
 <!ENTITY aa-perl SYSTEM "../appendixa/perl.xml">
+<!ENTITY aa-perl-shortdesc SYSTEM "../appendixa/perl-shortdesc.xml">
 <!ENTITY aa-perl-desc SYSTEM "../appendixa/perl-desc.xml">
 <!ENTITY aa-perl-dep SYSTEM "../appendixa/perl-dep.xml">
 <!ENTITY aa-perl-down SYSTEM "../appendixa/perl-down.xml">