瀏覽代碼

rewrote findutils installation page

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2311 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Gerard Beekmans 22 年之前
父節點
當前提交
a1d3af694f

+ 2 - 0
appendixa/findutils-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Findutils Installation Dependencies</title>
 

+ 4 - 6
appendixa/findutils-desc.xml

@@ -1,12 +1,10 @@
-<sect2><title>Contents of Findutils</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &findutils-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>bigram, code, find, frcode, locate, updatedb and
-xargs</para></sect3>
+<para>Last checked against version &findutils-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program files descriptions</title>
 
 <sect4><title>bigram</title>
 <para>bigram is used together with code to produce older-style locate 

+ 17 - 0
appendixa/findutils-shortdesc.xml

@@ -0,0 +1,17 @@
+<sect2><title>Contents of Findutils</title>
+
+<para>Last checked against version &findutils-contversion;.</para>
+
+<para>The Findutils package contains programs to find files, either
+on-the-fly (by doing a live recursive search through directories and only
+showing files that match the specifications) or by searching through a
+database.</para>
+
+<para>Findutils installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>bigram, code, find, frcode, locate, updatedb and
+xargs</para></sect3>
+
+</sect2>
+

+ 1 - 0
appendixa/findutils.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="findutils.html" dir="appendixa"?>
 
 &aa-findutils-down;
+&aa-findutils-shortdesc;
 &aa-findutils-desc;
 &aa-findutils-dep;
 

+ 0 - 9
chapter05/findutils-exp.xml

@@ -1,9 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput>: This 
-patch is to fix some compilation errors by
-avoiding a variable conflict and changing some bad syntax.</para>
-
-</sect2>
-

+ 12 - 7
chapter05/findutils-inst.xml

@@ -1,15 +1,20 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installing Findutils</title>
 
-<para>This package requires its patch to be applied before you can
-install it.</para>
+<para>The Findutils package is quite old and it has problems compiling
+against newer Glibc versions (Glibc-2.0.x and up). You need to apply the
+patch that fixes some variable conflicts you'd otherwise end up
+with:</para>
+
+<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput></screen></para>
 
-<para>Install Findutils by running the following commands:</para>
+<para>Install Findutils by running the following:</para>
 
-<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch &amp;&amp;
-CPPFLAGS="-Dre_max_failures=re_max_failures2" \
-&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static &amp;&amp;
-make &amp;&amp;
+<para><screen><userinput>CPPFLAGS="-Dre_max_failures=re_max_failures2" \
+&nbsp;&nbsp;&nbsp;&nbsp;LDFLAGS="-static" ./configure --prefix=$LFS/static
+make
 make install</userinput></screen></para>
 
 </sect2>

+ 2 - 3
chapter05/findutils.xml

@@ -5,10 +5,9 @@
 <screen>Estimated build time:           &findutils-time-static;
 Estimated required disk space:  &findutils-compsize-static;</screen>
 
-&c5-findutils-inst;
-&c5-findutils-exp;
-&aa-findutils-desc;
+&aa-findutils-shortdesc;
 &aa-findutils-dep;
+&c5-findutils-inst;
 
 </sect1>
 

+ 1 - 0
entities/findutils.ent

@@ -11,6 +11,7 @@
 <!ENTITY c6-findutils-inst SYSTEM "../chapter06/findutils-inst.xml">
 
 <!ENTITY aa-findutils SYSTEM "../appendixa/findutils.xml">
+<!ENTITY aa-findutils-shortdesc SYSTEM "../appendixa/findutils-shortdesc.xml">
 <!ENTITY aa-findutils-desc SYSTEM "../appendixa/findutils-desc.xml">
 <!ENTITY aa-findutils-dep SYSTEM "../appendixa/findutils-dep.xml">
 <!ENTITY aa-findutils-down SYSTEM "../appendixa/findutils-down.xml">