From 2ec4b60f359413c6f0163b9e72108c24460573e7 Mon Sep 17 00:00:00 2001
From: Zack Winkles <winkie@linuxfromscratch.org>
Date: Mon, 7 Jun 2004 19:16:21 +0000
Subject: Normalized usage of sed throughout the book

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3762 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/adjusting.xml  | 2 +-
 chapter05/udev.xml       | 4 ++--
 chapter05/util-linux.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'chapter05')

diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index ae676717e..2cdf60937 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -40,7 +40,7 @@ to the new dynamic linker. A simple sed script will accomplish this:</para>
 <!-- Ampersands are needed to allow cut and paste -->
 
 <screen><userinput>SPECFILE=`gcc --print-file specs` &amp;&amp;
-sed -e 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \
+sed 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \
     $SPECFILE &gt; tempspecfile &amp;&amp;
 mv -f tempspecfile $SPECFILE &amp;&amp;
 unset SPECFILE</userinput></screen>
diff --git a/chapter05/udev.xml b/chapter05/udev.xml
index 5b38a2baf..35ed76c61 100644
--- a/chapter05/udev.xml
+++ b/chapter05/udev.xml
@@ -42,12 +42,12 @@ by applying the following patch:</para>
 which is bad since we install udev in a non-standard location. Fix this by
 running the following:</para>
 
-<screen><userinput>sed -i 's:\/sbin\/udev:/tools&amp;:' udevstart.c</userinput></screen>
+<screen><userinput>sed -i 's@/sbin/udev@/tools/sbin/udev@g' udevstart.c</userinput></screen>
 
 <para>Also assure that udev knows the correct location to look for its
 configuration files:</para>
 
-<screen><userinput>sed -i 's:\/etc:/tools&amp;:' etc/udev/udev.conf.in</userinput></screen>
+<screen><userinput>sed -i 's@/etc@/tools/etc@g' etc/udev/udev.conf.in</userinput></screen>
 
 <para>Now compile Udev:</para>
 
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index 1f7ab22b1..7561ddd84 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -36,7 +36,7 @@ by applying the following patch:</para>
 from the <filename class="directory">/tools</filename> directory.  This is fixed by altering the configure
 script:</para>
 
-<screen><userinput>sed -i "s@/usr/include@/tools/include@g" configure</userinput></screen>
+<screen><userinput>sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
 
-- 
cgit v1.2.3-54-g00ecf