r2047 - / trunk/BOOK trunk/BOOK/temp-system/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu Jul 20 08:47:46 PDT 2006


Author: jim
Date: 2006-07-20 09:47:44 -0600 (Thu, 20 Jul 2006)
New Revision: 2047

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/temp-system/multilib/bzip2.xml
Log:
 r4700 at server (orig r2168):  jim | 2006-07-20 07:38:40 -0700
  r4696 at server:  jim | 2006-07-20 07:20:45 -0700
  Updated Multilib sed for bzip2. Thank you G. Moko
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2167
   + b6734a72-470d-0410-b049-f317dca95413:/:2168


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4695
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4696
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/temp-system/multilib/bzip2.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/bzip2.xml	2006-07-20 15:47:36 UTC (rev 2046)
+++ trunk/BOOK/temp-system/multilib/bzip2.xml	2006-07-20 15:47:44 UTC (rev 2047)
@@ -27,8 +27,9 @@
     a multi-architecture build, and change the default lib path
     to <filename class="directory">lib64</filename>:</para>
 
-<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1 at g' \
-    -e 's@/lib\(/\| \|$\)@/lib64\1 at g' Makefile</userinput></screen>
+<screen os="m2"><userinput>cp -v Makefile{,.orig}
+sed -e 's@^\(all:.*\) test@\1 at g' \
+    -e 's@/lib\(/\| \|$\)@/lib64\1 at g' Makefile.orig > Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"




More information about the cross-lfs mailing list