Changeset 03e6a40 for BOOK/final-system/multilib/ncurses-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/ncurses-n32.xml (modified) (2 diffs)

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"
@@ -95 +97 @@
 ln -sfv ncurses5w-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
 
-    <para os="n">Now we will create a symlink for /usr/share/terminfo in
-    <filename class="directory">/usr/lib32</filename> for compatibility:</para>
-
-<screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib32/terminfo</userinput></screen>
-
   </sect2>