Made backup of config.make before sed'ing

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

2 files changed, 17 insertions, 16 deletions

diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml
index ab2c09f53..c6c30fcf1 100644
--- a/chapter06/glibc-exp.xml
+++ b/chapter06/glibc-exp.xml
@@ -13,29 +13,29 @@ will have Glibc default to using /lib and /usr/lib which is fine
 right now).</para>
 
 <para><userinput>sed 's%\$(PERL)%/usr/bin/perl%' 
-../glibc-&glibc-version;/malloc/Makefile &gt; tmp~:</userinput> This sed command
-searches through <filename>../glibc-&glibc-version;/malloc/Makefile</filename> and
+malloc/Makefile &gt; tmp~:</userinput> This sed command
+searches through <filename>malloc/Makefile</filename> and
 converts all occurances of <filename>$(PERL)</filename> to
 <filename>/usr/bin/perl</filename>.  The output is then written to the
 file <filename>tmp~</filename>.  This is done because Glibc can't
 autodetect perl since it's not installed yet at the time when we install
 Glibc.</para>
 
-<para><userinput>mv -f tmp~ ../glibc-&glibc-version;/malloc/Makefile:</userinput> The file
+<para><userinput>mv -f tmp~ malloc/Makefile:</userinput> The file
 <filename>tmp~</filename> is now moved back to
-<filename>../glibc-&glibc-version;/malloc/Makefile</filename>.  We do this because
+<filename>malloc/Makefile</filename>.  We do this because
 when using sed, we can't write straight back to this file so we need to
 use a temporary file in between.</para>
 
-<para><userinput>sed 's/root/0' ../glibc-&glibc-version;/login/Makefile &gt;
+<para><userinput>sed 's/root/0' login/Makefile &gt;
 tmp~:</userinput> This sed command replaces all occurances of
 <filename>root</filename> in
-<filename>../glibc-&glibc-version;/login/Makefile</filename> with 0.  This is
+<filename>login/Makefile</filename> with 0.  This is
 because as we don't have glibc on the LFS system yet, usernames can't 
 be resolved to their user id's.  Therefore, we replace the username 
 root with the id 0. </para>
 
-<para><userinput>mv -f tmp~ ../glibc-&glibc-version;/login/Makefile:</userinput> Asabove, we are using a temporary file (<filename>tmp~</filename>) to store the
+<para><userinput>mv -f tmp~ login/Makefile:</userinput> Asabove, we are using a temporary file (<filename>tmp~</filename>) to store the
 edited Makefile and then copying it back over the original.</para>
 
 <para><userinput>--enable-add-ons:</userinput> This enables the add-on that
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index ec3767dcb..3b5d40309 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -10,20 +10,21 @@ would do.</para>
 
 <para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &amp;&amp;</userinput>
 <userinput>touch /etc/ld.so.conf &amp;&amp;</userinput>
+<userinput>cp -f malloc/Makefile \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;malloc/Makefile.backup &amp;&amp;</userinput>
+<userinput>sed 's%\$(PERL)%/usr/bin/perl%' \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;malloc/Makefile &gt; tmp~ &amp;&amp;</userinput>
+<userinput>mv -f tmp~ malloc/Makefile &amp;&amp;</userinput>
+<userinput>cp -f login/Makefile \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;login/Makefile.backup &amp;&amp;</userinput>
+<userinput>sed 's/root/0/' login/Makefile &gt; tmp~ &amp;&amp;</userinput>
+<userinput>mv -f tmp~ login/Makefile &amp;&amp;</userinput>
 <userinput>mkdir ../glibc-build &amp;&amp;</userinput>
 <userinput>cd ../glibc-build &amp;&amp;</userinput>
-<userinput>cp -f ../glibc-&glibc-version;/malloc/Makefile \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;../glibc-&glibc-version;/malloc/Makefile.backup &amp;&amp;</userinput>
-<userinput>sed 's%\$(PERL)%/usr/bin/perl%' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;../glibc-&glibc-version;/malloc/Makefile &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv -f tmp~ ../glibc-&glibc-version;/malloc/Makefile &amp;&amp;</userinput>
-<userinput>cp -f ../glibc-&glibc-version;/login/Makefile \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;../glibc-&glibc-version;/login/Makefile.backup &amp;&amp;</userinput>
-<userinput>sed 's/root/0/' ../glibc-&glibc-version;/login/Makefile &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv -f tmp~ ../glibc-&glibc-version;/login/Makefile &amp;&amp;</userinput>
 <userinput>../glibc-&glibc-version;/configure \</userinput>
 <userinput>&nbsp;&nbsp;&nbsp;--prefix=/usr --enable-add-ons \</userinput>
 <userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin &amp;&amp;</userinput>
+<userinput>cp -f config.make config.make.backup &amp;&amp;</userinput>
 <userinput>sed 's/cross-compiling = yes/cross-compiling = no/' \</userinput>
 <userinput>&nbsp;&nbsp;&nbsp;config.make &gt; config.make~ &amp;&amp;</userinput>
 <userinput>mv -f config.make~ config.make &amp;&amp;</userinput>