Changes in chapter06/ncurses.xml [943f225:6dff9ef]

File:

• chapter06/ncurses.xml (modified) (6 diffs)

chapter06/ncurses.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -79 +79 @@
         <term><parameter>--with-manpage-format=normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses from installing compressed manual
+          <para>This prevents Ncurses installing compressed manual
           pages, which may happen if the host distribution itself
           has compressed manual pages.</para>
@@ -95 +95 @@
         <term><parameter>--without-normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses from building and installing static C
+          <para>This prevents Ncurses building and installing static C
           libraries.</para>
         </listitem>
@@ -103 +103 @@
         <term><parameter>--without-debug</parameter></term>
         <listitem>
-          <para>This prevents Ncurses from building and installing debug
+          <para>This prevents Ncurses building and installing debug
           libraries.</para>
         </listitem>
@@ -157 +157 @@
 
 <screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
-ln -sv libncursesw.so $LFS/usr/lib/libncurses.so
-sed -e 's/^#if.*XOPEN.*$/#if 1/' \
-    -i $LFS/usr/include/curses.h</userinput></screen>
+echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
 <!--
     <para>Remove an unneeded static library not handled by
@@ -179 +177 @@
 
       <varlistentry>
-        <term><command>ln -sv libncursesw.so $LFS/usr/lib/libncurses.so</command></term>
+        <term><command>echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</command></term>
         <listitem>
           <para>The <filename>libncurses.so</filename> library is needed by
-          a few packages we will build soon. We create this symlink to use
-          <filename>libncursesw.so</filename> as a replacement.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>sed -e 's/^#if.*XOPEN.*$/#if 1/' ...</command></term>
-        <listitem>
-          <para>The header file <filename>curses.h</filename> contains
-          the definition of various Ncurses data structures.  With different
-          preprocessor macro definitions two different sets of the data
-          structure definition may be used: the 8-bit definition is
-          compatible with <filename>libncurses.so</filename> and the
-          wide-character definition is compatible with
-          <filename>libncursesw.so</filename>.  Since we are using
-          <filename>libncursesw.so</filename> as a replacement of
-          <filename>libncurses.so</filename>, edit the header file so it
-          will always use the wide-character data structure definition
-          compatible with <filename>libncursesw.so</filename>.</para>
+          a few packages we will build soon. We create this small linker
+          script, as this is what is done in <xref
+          linkend="chapter-building-system"/>.</para>
         </listitem>
       </varlistentry>