Changeset 2ce95e9 for BOOK/final-system/multilib

Timestamp:

May 19, 2011, 7:23:24 AM (14 years ago)

Author:

Jonathan Norman <jonathan at bluesquarelinux.co.uk>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

1ac2d0c

Parents:

2864455

Message:

No longer need to move liblmza.a in XZ for pure 32 / 64bit builds

Location:

BOOK/final-system/multilib

Files:

• xz-64bit.xml (modified) (1 diff)
• xz-n32.xml (modified) (1 diff)
• xz.xml (modified) (1 diff)

BOOK/final-system/multilib/xz-64bit.xml

@@ -56 +56 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="xz.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <screen os="k"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/xz-n32.xml

@@ -57 +57 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="xz.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/xz.xml

@@ -57 +57 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">Move the static libraries to the proper location:</para>
+
+    <screen os="k"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
 
   </sect2>