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

[svn at cross-lfs.org]

Author: jim
Date: Mon Dec 22 01:16:36 2008
New Revision: 4154

Log:
Fixed Validation Errors with LZMA Change

Modified:
    trunk/BOOK/temp-system/64/lzma.xml
    trunk/BOOK/temp-system/common/lzma.xml
    trunk/BOOK/temp-system/multilib/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 Mon Dec 22 01:16:36 2008
@@ -24,7 +24,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+            --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/lzma.xml"
@@ -32,18 +35,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cc"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-            --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/lzma.xml"
     xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/common/lzma.xml
==============================================================================
--- trunk/BOOK/temp-system/common/lzma.xml (original)
+++ trunk/BOOK/temp-system/common/lzma.xml Mon Dec 22 01:16:36 2008
@@ -26,12 +26,12 @@
     href="../../final-system/common/lzma.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cc"><userinput>CC="${CC}" ./configure --prefix=/tools \
+<screen os="cb"><userinput>CC="${CC}" ./configure --prefix=/tools \
             --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
-    <para os="cd">Install the package:</para>
+    <para os="cc">Install the package:</para>
 
-<screen os="ce"><userinput>make install</userinput></screen>
+<screen os="cd"><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 Mon Dec 22 01:16:36 2008
@@ -26,17 +26,17 @@
     href="../common/lzma.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cc"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
             --build=${CLFS_HOST} --host=${CLFS_TARGET}\
 	    --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
+    xpointer="xpointer(//*[@os='cc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
+    xpointer="xpointer(//*[@os='cd'])"/>
 
   </sect2>