Преглед на файлове

Transformed the two sed commands into one sed that does both

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1080 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Gerard Beekmans преди 24 години
родител
ревизия
de3414e268
променени са 2 файла, в които са добавени 10 реда и са изтрити 9 реда
  1. 6 5
      chapter05/fileutils-exp.xml
  2. 4 4
      chapter05/fileutils-inst.xml

+ 6 - 5
chapter05/fileutils-exp.xml

@@ -5,11 +5,12 @@
 run this command in order to keep a backup of the file we are about to
 change.</para>
 
-<para><screen><userinput>sed 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; tmp &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;tmp &gt; lib/Makefile.in : </userinput></screen> This 
-is used to fix a problem with building fileutils statically on glibc 2.2.3 
+<para><screen><userinput>cp -f lib/Makefile.in lib/Makefile.in.backup &amp;&amp;</userinput>
+<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;</userinput>
+<userinput>mv lib/Makefile.in~ lib/Makefile.in:</userinput></screen>
+This is used to fix a problem with building fileutils statically on glibc 2.2.3 
 systems.  If this isn't done, then there is the possibility of all of the 
 fileutils programs causing segmentation faults once chroot is entered 
 in chapter 6.</para>

+ 4 - 4
chapter05/fileutils-inst.xml

@@ -8,10 +8,10 @@ and Durons are the most reported used CPU's). If you are in this category,
 run the following to sed commands before you compile this package.
 
 <screen><userinput>cp -f lib/Makefile.in lib/Makefile.in.backup &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; tmp &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;tmp &gt; lib/Makefile.in</userinput></screen></para>
+<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;</userinput>
+<userinput>mv lib/Makefile.in~ lib/Makefile.in</userinput></screen></para>
 
 <para>Install fileutils by running the following commands:
 <screen><userinput>./configure --disable-nls \</userinput>