Changeset 03e6a40 for BOOK/final-system/multilib/readline-64bit.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/readline-64bit.xml (modified) (1 diff)

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

@@ -61 +61 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib64</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib64</filename>.</para>
 
-<screen os="k"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
-
-    <para os="l">Next, remove the <filename class="extension">.so</filename>
-    files in <filename class="directory">/lib64</filename> and relink them into
-    <filename class="directory">/usr/lib64</filename>.</para>
-
-<screen os="m"><userinput>rm -v /lib64/lib{readline,history}.so
-ln -svf ../../lib64/libreadline.so.&readline-version2; /usr/lib64/libreadline.so
-ln -svf ../../lib64/libhistory.so.&readline-version2; /usr/lib64/libhistory.so</userinput></screen>
+<screen os="k"><userinput>ln -svf ../../lib64/$(readlink /lib64/libreadline.so) /usr/lib64/libreadline.so
+ln -svf ../../lib64/$(readlink /lib64/libhistory.so) /usr/lib64/libhistory.so
+rm -v /lib64/lib{readline,history}.so</userinput></screen>
 
   </sect2>