Changeset 78dd6d6 for BOOK

Timestamp:

Jan 19, 2014, 6:53:32 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

4302a8c

Parents:

28b9847

Message:

Use readlink when creating symbolic links for the dynamic libraries and remove the need for readlin-version2 entity.

Location:

BOOK/final-system

Files:

• common/readline.xml (modified) (1 diff)
• multilib/readline-64bit.xml (modified) (1 diff)
• multilib/readline-n32.xml (modified) (1 diff)

BOOK/final-system/common/readline.xml

@@ -53 +53 @@
 <screen os="k"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
 
-    <para os="l">Next, remove the <filename class="extension">.so</filename>
-    files in <filename class="directory">/lib</filename> and relink them into
-    <filename class="directory">/usr/lib</filename>.</para>
+    <para os="l">Next, relink the dynamic libraries into <filename class="directory">/usr/lib</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename>.</para>
 
-<screen os="m"><userinput>rm -v /lib/lib{readline,history}.so
-ln -svf ../../lib/libreadline.so.&readline-version2; /usr/lib/libreadline.so
-ln -svf ../../lib/libhistory.so.&readline-version2; /usr/lib/libhistory.so</userinput></screen>
+<screen os="m"><userinput>
+ln -svf ../../lib/$(readlink /lib/libreadline.so) /usr/lib/libreadline.so
+ln -svf ../../lib/$(readlink /lib/libhistory.so) /usr/lib/libhistory.so
+rm -v /lib/lib{readline,history}.so</userinput></screen>
 
   </sect2>

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

@@ -71 +71 @@
 <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>
+    <para os="l">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="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="m"><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>

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

@@ -72 +72 @@
 <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>
+    <para os="l">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="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="m"><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>