instead of sed'ing the config.make file, create a configparms file with

'cross-compiling = no' as contents


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

2 files changed, 8 insertions, 14 deletions

diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml
index fdb7e3195..bf66d0a5f 100644
--- a/chapter06/glibc-exp.xml
+++ b/chapter06/glibc-exp.xml
@@ -33,17 +33,13 @@ we install with Glibc: linuxthreads</para>
 <para><userinput>--libexecdir=/usr/bin:</userinput> This will cause the
 pt_chown program to be installed in the /usr/bin directory.</para>
 
-<para><userinput>sed 's/cross-compiling = yes/cross-compiling = no/'
-config.make.backup &gt; config.make:</userinput> This time, sed searches
-through <filename>config.make.backup</filename> and replaces all occurences
-of <filename>cross-compiling = yes</filename> with
-<filename>cross-compiling = no</filename>. We do this because we are
-only building for our own system. Cross-compiling is used, for instance,
-to build a package for an Apple Power PC on an Intel system. The reason
-Glibc thinks we're cross-compiling is that it can't compile a test program
-to determine this, so it automatically defaults to a cross-compiler.
-Compiling the test program failes because Glibc hasn't been installed
-yet.</para>
+<para><userinput>echo "cross-compiling = no" &gt; configparms:</userinput>
+We do this because we are only building for our own system. Cross-compiling
+is used, for instance, to build a package for an Apple Power PC on an
+Intel system. The reason Glibc thinks we're cross-compiling is that it
+can't compile a test program to determine this, so it automatically defaults
+to a cross-compiler. Compiling the test program failes because Glibc hasn't
+been installed yet.</para>
 
 <para><userinput>exec /bin/bash:</userinput>This command will
 start a new bash shell which will replace the current shell. This is 
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index fa01b0969..0e54cb85b 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -29,9 +29,7 @@ mkdir ../glibc-build &amp;&amp;
 cd ../glibc-build &amp;&amp;
 ../glibc-&glibc-version;/configure --prefix=/usr \
 &nbsp;&nbsp;&nbsp;--enable-add-ons --libexecdir=/usr/bin &amp;&amp;
-cp config.make config.make.backup &amp;&amp;
-sed 's/cross-compiling = yes/cross-compiling = no/' \
-&nbsp;&nbsp;&nbsp;config.make.backup &gt; config.make &amp;&amp;
+echo "cross-compiling = no" &gt; configparms &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
 make localedata/install-locales &amp;&amp;