From 585ce086da5af7b8f3e33ae93c6b0aa128b51555 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Sat, 10 May 2003 17:20:47 +0000
Subject: [PATCH] made adjusting specs file architecture independant

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2548 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml          |  6 ++++++
 chapter05/lockingglibc.xml       | 11 ++++++-----
 chapter06/adjustingtoolchain.xml | 12 +++++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 43538a6b9..75e881163 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -63,6 +63,12 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 10th, 2003 [gerard]: Chapter 06 - Adjusting toolchain:
+Made it more architecture independant.</para></listitem>
+
+<listitem><para>May 10th, 2003 [gerard]: Chapter 05 - Locking in Glibc:
+Made it more architecture independant.</para></listitem>
+
 <listitem><para>May 7th, 2003 [gerard]: Removed GCC No Debug patches. No
 longer assume gcc-core and gcc-g++ packages are downloaded, so added
 appropriate --enable-languages options.</para></listitem>
diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml
index dd9c61e2c..95d086467 100644
--- a/chapter05/lockingglibc.xml
+++ b/chapter05/lockingglibc.xml
@@ -11,11 +11,12 @@
 
 <para>You can remove the binutils-* directories now.</para>
 
-<para><screen><userinput>SPECFILE=/stage1/lib/gcc-lib/i686-pc-linux-gnu/*/specs &amp;&amp;
-cp ${SPECFILE} ./XX &amp;&amp;
-sed 's@/lib/ld-linux.so.2@/stage1/lib/ld-linux.so.2@g' ./XX > ${SPECFILE} &amp;&amp;
-unset SPECFILE &amp;&amp;
-rm -f ./XX</userinput></screen></para>
+<para><screen><userinput>SPECFILE=/stage1/lib/gcc-lib/*/*/specs
+sed -e 's@/lib/ld.so.1@/stage1/lib/ld.so.1@g' \
+&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/lib/ld-linux.so.2@/stage1/lib/ld-linux.so.2@g' \
+&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > XX
+mv XX $SPECFILE
+unset SPECFILE</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index 941b79bf5..78de9e897 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -4,11 +4,13 @@
 
 <para><screen><userinput>cd binutils-build
 make -C ld INSTALL=/stage1/bin/install install-data-local
-SPECFILE=/stage1/lib/gcc-lib/i686-pc-linux-gnu/*/specs &amp;&amp;
-cp ${SPECFILE} ./XX &amp;&amp;
-sed 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' ./XX > ${SPECFILE} &amp;&amp;
-unset SPECFILE &amp;&amp;
-rm -f ./XX</userinput></screen></para>
+SPECFILE=/stage1/lib/gcc-lib/*/*/specs
+sed -e 's@/lib/ld.so.1@/stage1/lib/ld.so.1@g' \
+&nbsp;&nbsp;&nbsp;&nbsp;-e
+'s@/lib/ld-linux.so.2@/stage1/lib/ld-linux.so.2@g' \
+&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > XX
+mv XX $SPECFILE
+unset SPECFILE</userinput></screen></para>
 
 </sect1>