Jelajahi Sumber

redid grep installation page

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2316 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Gerard Beekmans 22 tahun lalu
induk
melakukan
b8b390a5c1
4 mengubah file dengan 24 tambahan dan 18 penghapusan
  1. 0 10
      chapter05/grep-exp.xml
  2. 21 4
      chapter05/grep-inst.xml
  3. 2 3
      chapter05/grep.xml
  4. 1 1
      entities/grep.ent

+ 0 - 10
chapter05/grep-exp.xml

@@ -1,10 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>--disable-perl-regexp:</userinput> This configure option
-makes sure Grep is not linked against the PCRE library, which is often
-only available as a shared library in distributions. Not using this option
-might result in a compilation error.</para>
-
-</sect2>
-

+ 21 - 4
chapter05/grep-inst.xml

@@ -1,13 +1,30 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Grep</title>
 
-<para>Install Grep by running the following commands:</para>
+<para>Prepare Grep to be compiled:</para>
 
 <para><screen><userinput>LDFLAGS="-static" CPPFLAGS=-Dre_max_failures=re_max_failures2 \
 &nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static --disable-nls \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-perl-regexp &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-perl-regexp</userinput></screen></para>
+
+<para>The meaning of the configure option is:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--disable-perl-regexp:</userinput> This
+configure option makes sure Grep is not linked against the PCRE library,
+which is often only available as a shared library in distributions. Not
+using this option might result in a compilation error.</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>
 

+ 2 - 3
chapter05/grep.xml

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

+ 1 - 1
entities/grep.ent

@@ -2,12 +2,12 @@
 
 <!ENTITY c5-grep SYSTEM "../chapter05/grep.xml">
 <!ENTITY c5-grep-inst SYSTEM "../chapter05/grep-inst.xml">
-<!ENTITY c5-grep-exp SYSTEM "../chapter05/grep-exp.xml">
 
 <!ENTITY c6-grep SYSTEM "../chapter06/grep.xml">
 <!ENTITY c6-grep-inst SYSTEM "../chapter06/grep-inst.xml">
 
 <!ENTITY aa-grep SYSTEM "../appendixa/grep.xml">
+<!ENTITY aa-grep-shortdesc SYSTEM "../appendixa/grep-shortdesc.xml">
 <!ENTITY aa-grep-desc SYSTEM "../appendixa/grep-desc.xml">
 <!ENTITY aa-grep-dep SYSTEM "../appendixa/grep-dep.xml">
 <!ENTITY aa-grep-down SYSTEM "../appendixa/grep-down.xml">