Loading...

cross-lfs@linuxfromscratch.org

[Prev] Thread [Next]  |  [Prev] Date [Next]

r1633 - / trunk/BOOK trunk/BOOK/final-system/common trunk/BOOK/final-system/multilib jim Mon May 22 02:05:37 2006

Author: jim
Date: 2006-05-22 03:05:35 -0600 (Mon, 22 May 2006)
New Revision: 1633

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/final-system/common/bzip2.xml
   trunk/BOOK/final-system/multilib/bzip2-n32.xml
   trunk/BOOK/final-system/multilib/bzip2.xml
Log:
 [EMAIL PROTECTED] (orig r1671):  jim | 2006-05-22 01:21:13 -0700
  [EMAIL PROTECTED]:  jim | 2006-05-22 01:16:46 -0700
  Updates to Bzip2 text and build for multilib
 



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


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3515
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:3583
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/final-system/common/bzip2.xml
===================================================================
--- trunk/BOOK/final-system/common/bzip2.xml    2006-05-21 21:12:01 UTC (rev 
1632)
+++ trunk/BOOK/final-system/common/bzip2.xml    2006-05-22 09:05:35 UTC (rev 
1633)
@@ -60,9 +60,11 @@
 
 <screen os="e"><userinput>make</userinput></screen>
 
-    <para os="f">If reinstalling Bzip2, perform
+    <note os="f">
+    <para>If reinstalling Bzip2, perform
     <userinput>rm -vf /usr/bin/bz*</userinput> first, otherwise the
     following <command>make install</command> will fail.</para>
+    </note>
 
     <para os="g">Install the programs:</para>
 

Modified: trunk/BOOK/final-system/multilib/bzip2-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-n32.xml      2006-05-21 21:12:01 UTC 
(rev 1632)
+++ trunk/BOOK/final-system/multilib/bzip2-n32.xml      2006-05-22 09:05:35 UTC 
(rev 1633)
@@ -42,7 +42,7 @@
 
     <para os="c1">Recompile the package using a non-shared library.</para>
 
-<screen os="d"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ 
${BUILDN32}"</userinput></screen>
+<screen os="d"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" 
libbz2.a</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"

Modified: trunk/BOOK/final-system/multilib/bzip2.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2.xml  2006-05-21 21:12:01 UTC (rev 
1632)
+++ trunk/BOOK/final-system/multilib/bzip2.xml  2006-05-22 09:05:35 UTC (rev 
1633)
@@ -37,7 +37,7 @@
     href="../common/bzip2.xml"
     xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
-<screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ 
${BUILD32}"</userinput></screen>
+<screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" 
libbz2.a</userinput></screen>
 
     <para os="i">Install the libraries, make
     some necessary symbolic links, and clean up:</para>