[Clfs-commits] commit: r4205 - in /trunk/BOOK/temp-system: 64/lzma.xml common/lzma.xml multilib/lzma.xml native/lzma.xml native64/lzma.xml

[svn at cross-lfs.org]

Author: jim
Date: Wed Dec 24 22:49:19 2008
New Revision: 4205

Log:
Fixed LZMA Linking in Book - Part 2

Modified:
    trunk/BOOK/temp-system/64/lzma.xml
    trunk/BOOK/temp-system/common/lzma.xml
    trunk/BOOK/temp-system/multilib/lzma.xml
    trunk/BOOK/temp-system/native/lzma.xml
    trunk/BOOK/temp-system/native64/lzma.xml

Modified: trunk/BOOK/temp-system/64/lzma.xml
==============================================================================
--- trunk/BOOK/temp-system/64/lzma.xml (original)
+++ trunk/BOOK/temp-system/64/lzma.xml Wed Dec 24 22:49:19 2008
@@ -31,11 +31,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='cc'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/lzma.xml"
+    xpointer="xpointer(//*[@os='ce'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/lzma.xml"
+    xpointer="xpointer(//*[@os='cf'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/common/lzma.xml
==============================================================================
--- trunk/BOOK/temp-system/common/lzma.xml (original)
+++ trunk/BOOK/temp-system/common/lzma.xml Wed Dec 24 22:49:19 2008
@@ -29,9 +29,17 @@
 <screen os="cb"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
-    <para os="cc">Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/lzma.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="cd"><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/lzma.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <para os="ce">Install the package:</para>
+
+<screen os="cf"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/multilib/lzma.xml
==============================================================================
--- trunk/BOOK/temp-system/multilib/lzma.xml (original)
+++ trunk/BOOK/temp-system/multilib/lzma.xml Wed Dec 24 22:49:19 2008
@@ -32,11 +32,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='cc'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/lzma.xml"
+    xpointer="xpointer(//*[@os='ce'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/lzma.xml"
+    xpointer="xpointer(//*[@os='cf'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/native/lzma.xml
==============================================================================
--- trunk/BOOK/temp-system/native/lzma.xml (original)
+++ trunk/BOOK/temp-system/native/lzma.xml Wed Dec 24 22:49:19 2008
@@ -28,9 +28,17 @@
 
 <screen os="cb"><userinput>./configure --prefix=/tools</userinput></screen>
 
-    <para os="cc">Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/lzma.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="cd"><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/lzma.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <para os="ce">Install the package:</para>
+
+<screen os="cf"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/native64/lzma.xml
==============================================================================
--- trunk/BOOK/temp-system/native64/lzma.xml (original)
+++ trunk/BOOK/temp-system/native64/lzma.xml Wed Dec 24 22:49:19 2008
@@ -30,12 +30,20 @@
      --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../native/lzma.xml"
-    xpointer="xpointer(//*[@os='cc'])"/>
+    href="../common/lzma.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/lzma.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../native/lzma.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
+    xpointer="xpointer(//*[@os='ce'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../native/lzma.xml"
+    xpointer="xpointer(//*[@os='cf'])"/>
 
   </sect2>