Changeset 5de15f0

Timestamp:

Jan 19, 2014, 6:55:49 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

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

Children:

21403ba

Parents:

4302a8c

Message:

Use readlink when creating symbolic links to ncurses dynamic libraries of libncurses, libform, libpanel, and libmenu.

Location:

BOOK/final-system

Files:

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

BOOK/final-system/common/ncurses.xml

@@ -57 +57 @@
     <para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
 
-<screen os="k"><userinput>rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so
-ln -svf ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
-ln -svf ../../lib/libmenuw.so.5 /usr/lib/libmenuw.so
-ln -svf ../../lib/libpanelw.so.5 /usr/lib/libpanelw.so
-ln -svf ../../lib/libformw.so.5 /usr/lib/libformw.so</userinput></screen>
+<screen os="k"><userinput>
+ln -svf ../../lib/$(readlink /lib/libncursesw.so) /usr/lib/libncursesw.so
+ln -svf ../../lib/$(readlink /lib/libmenuw.so) /usr/lib/libmenuw.so
+ln -svf ../../lib/$(readlink /lib/libpanelw.so) /usr/lib/libpanelw.so
+ln -svf ../../lib/$(readlink /lib/libformw.so) /usr/lib/libformw.so
+rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so
+</userinput></screen>
 
     <para os="l">Now we will make our Ncurses compatible for older and non-widec compatible programs

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

@@ -74 +74 @@
     <para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
 
-<screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
-ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so
-ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so
-ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so
-ln -svf ../../lib64/libformw.so.5 /usr/lib64/libformw.so</userinput></screen>
+<screen os="k"><userinput>
+ln -svf ../../lib64/$(readlink /lib64/libncursesw.so) /usr/lib64/libncursesw.so
+ln -svf ../../lib64/$(readlink /lib64/libmenuw.so) /usr/lib64/libmenuw.so
+ln -svf ../../lib64/$(readlink /lib64/libpanelw.so) /usr/lib64/libpanelw.so
+ln -svf ../../lib64/$(readlink /lib64/libformw.so) /usr/lib64/libformw.so
+rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
+</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -74 +74 @@
     <para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
 
-<screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
-ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libncursesw.so
-ln -svf ../../lib32/libmenuw.so.5 /usr/lib32/libmenuw.so
-ln -svf ../../lib32/libpanelw.so.5 /usr/lib32/libpanelw.so
-ln -svf ../../lib32/libformw.so.5 /usr/lib32/libformw.so</userinput></screen>
+<screen os="k"><userinput>
+ln -svf ../../lib32/$(readlink /lib32/libncursesw.so) /usr/lib32/libncursesw.so
+ln -svf ../../lib32/$(readlink /lib32/libmenuw.so) /usr/lib32/libmenuw.so
+ln -svf ../../lib32/$(readlink /lib32/libpanelw.so) /usr/lib32/libpanelw.so
+ln -svf ../../lib32/$(readlink /lib32/libformw.so) /usr/lib32/libformw.so
+rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
+</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"