Changeset 026bb5d for BOOK/final-system/multilib/xz.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Updated simp branch to match main book

File:

• BOOK/final-system/multilib/xz.xml (modified) (3 diffs)

BOOK/final-system/multilib/xz.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr libdir=/lib</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -43 +43 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/xz.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
@@ -51 +55 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <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>
+    xpointer="xpointer(//*[@os='k'])"/>
 
   </sect2>