Removed glibc-2.0 workarounds, removed export...unset constructs and replaced with var=varu ./configure constructs

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

1 files changed, 2 insertions, 19 deletions

diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index 7d10b61cd..81c923fb3 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -11,30 +11,13 @@ class="directory">libexec</filename> directory to <filename
 class="directory">/usr/bin</filename> it'll run <userinput>rm -rf
 /usr/bin/*</userinput></para>
 
-<para>When installing Gawk 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>cp awklib/Makefile.in awklib/Makefile.in.backup &amp;&amp;
-sed -e '/^datadir/s/awk/gawk/' \
--e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \
-&nbsp;&nbsp;&nbsp;&gt; awklib/Makefile.in &amp;&amp;
-export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
-./configure --prefix=$LFS/usr --disable-nls \
-&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin &amp;&amp;
-unset CPPFLAGS &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
-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 Gawk:</para>
+<para>Install Gawk by running the following commands:</para>
 
 <para><screen><userinput>cp awklib/Makefile.in awklib/Makefile.in.backup &amp;&amp;
 sed -e '/^datadir/s/awk/gawk/' \
 -e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \
 &nbsp;&nbsp;&nbsp;&gt; awklib/Makefile.in &amp;&amp;
+CPPFLAGS=-Dre_max_failures=re_max_failures2 \
 ./configure --prefix=$LFS/usr --disable-nls \
 &nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin &amp;&amp;
 make LDFLAGS=-static &amp;&amp;