Changes in BOOK/final-system/multilib/readline-n32.xml [dabbced:e89c4c9]

File:

• BOOK/final-system/multilib/readline-n32.xml (modified) (2 diffs)

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

@@ -36 +36 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
+   ./configure --prefix=/usr --libdir=/lib32 \
+    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -62 +63 @@
     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 /lib32/lib{readline,history}.a /usr/lib32</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/lib32</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib32</filename>.</para>
 
-<screen os="k"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
-
-    <para os="l">Next, remove the <filename class="extension">.so</filename>
-    files in <filename class="directory">/lib32</filename> and relink them into
-    <filename class="directory">/usr/lib32</filename>.</para>
-
-<screen os="m"><userinput>rm -v /lib32/lib{readline,history}.so
-ln -svf ../../lib32/libreadline.so.&readline-version2; /usr/lib32/libreadline.so
-ln -svf ../../lib32/libhistory.so.&readline-version2; /usr/lib32/libhistory.so</userinput></screen>
+<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libreadline.so) /usr/lib32/libreadline.so
+ln -svf ../../lib32/$(readlink /lib32/libhistory.so) /usr/lib32/libhistory.so
+rm -v /lib32/lib{readline,history}.so</userinput></screen>
 
   </sect2>