aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorMark Hymers <markh@linuxfromscratch.org>2001-09-06 15:44:47 +0000
committerMark Hymers <markh@linuxfromscratch.org>2001-09-06 15:44:47 +0000
commit37af5ac848fa702b390973d725d51eeac13ce563 (patch)
treeebdac5289024c447137e7e230fc9d608cb3529de /chapter05
parent7619a5a7177db622f73680048919cfffade7db8d (diff)
[Bug 162] seperate patch commands in chap5 from main commands
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1187 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/diffutils-inst.xml2
-rw-r--r--chapter05/grep-inst.xml13
-rw-r--r--chapter05/sed-inst.xml13
3 files changed, 25 insertions, 3 deletions
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index f84a4321f..c10da0f8d 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -14,7 +14,7 @@ use the first version.</para>
<userinput>make install</userinput></screen></para>
<para>If you are using a newer glibc version (2.2.x), you can use the following
-commands to install diffutils:</para>
+commands to install Diffutils:</para>
<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml
index f6635c56c..945da319d 100644
--- a/chapter05/grep-inst.xml
+++ b/chapter05/grep-inst.xml
@@ -1,13 +1,24 @@
<sect2>
<title>Installation of Grep</title>
-<para>Install Grep by running the following commands:</para>
+<para>When installing Grep using glibc-2.1.x on your base system,
+it may be necessary to use a fix to prevent a variable name conflict. The
+following commands can be used in this case. Note that these commands
+can also be used for other glibc versions so if you aren't sure, then
+use the first version.</para>
<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
<userinput>unset CPPFLAGS &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
<userinput>make install</userinput></screen></para>
+
+<para>If you are using a newer glibc version (2.2.x), you can use the
+following commands to install Grep:</para>
+
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
</sect2>
diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml
index 261fe36b0..82b4d4978 100644
--- a/chapter05/sed-inst.xml
+++ b/chapter05/sed-inst.xml
@@ -1,13 +1,24 @@
<sect2>
<title>Installation of Sed</title>
-<para>Install Sed by running the following commands:</para>
+<para>When installing Sed using glibc-2.1.x on your base system,
+it may be necessary to use a fix to prevent a variable name conflict. The
+following commands can be used in this case. Note that these commands
+can also be used for other glibc versions so if you aren't sure, then
+use the first version.</para>
<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;</userinput>
<userinput>unset CPPFLAGS &amp;&amp;</userinput>
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
<userinput>make install</userinput></screen></para>
+
+<para>If you are using a newer glibc version (2.2.x), you can use the
+following commands to install Sed:</para>
+
+<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
</sect2>