Changeset 03e6a40 for BOOK/final-system/multilib/xz-n32.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

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

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

@@ -12 +12 @@
 
   <indexterm zone="ch-system-xz-n32">
-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
     <secondary>N32</secondary>
   </indexterm>
@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib32 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -56 +57 @@
 
 <screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
-ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
+ln -sfv ../../lib32/$(readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
 
   </sect2>