From b8b390a5c18db7dd7c3d393b24b4e45f9d70f2b2 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Sat, 11 Jan 2003 18:15:01 +0000
Subject: redid grep installation page

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2316 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/grep-exp.xml  | 10 ----------
 chapter05/grep-inst.xml | 25 +++++++++++++++++++++----
 chapter05/grep.xml      |  5 ++---
 3 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 chapter05/grep-exp.xml

(limited to 'chapter05')

diff --git a/chapter05/grep-exp.xml b/chapter05/grep-exp.xml
deleted file mode 100644
index 80e162870..000000000
--- a/chapter05/grep-exp.xml
+++ /dev/null
@@ -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>
-
diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml
index 05609c353..99a9b6239 100644
--- a/chapter05/grep-inst.xml
+++ b/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>
 
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index a1c7e93ef..dbb0e80cf 100644
--- a/chapter05/grep.xml
+++ b/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>
 
-- 
cgit v1.2.3-54-g00ecf