Make the new book

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11831 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 51 insertions, 26 deletions

diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index c00135f12..5c868fffd 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -49,15 +49,20 @@
 
     <para>Prepare Ncurses for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools \
-            --with-shared   \
-            --without-debug \
-            --without-ada   \
-            --enable-widec  \
-            --enable-overwrite</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr             \
+            --host=$LFS_TGT           \
+            --build=$(./config.guess) \
+            --mandir=/usr/share/man   \
+            --with-shared             \
+            --without-debug           \
+            --without-ada             \
+            --without-normal          \
+            --disable-db-install      \
+            --enable-widec            \
+            --enable-pc-files</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the new configure options:</title>
 
       <varlistentry>
         <term><parameter>--without-ada</parameter></term>
@@ -69,17 +74,6 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--enable-overwrite</parameter></term>
-        <listitem>
-          <para>This tells Ncurses to install its header files into
-          <filename class="directory">/tools/include</filename>, instead of
-          <filename class="directory">/tools/include/ncurses</filename>, to
-          ensure that other packages can find the Ncurses headers
-          successfully.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--enable-widec</parameter></term>
         <listitem>
           <para>This switch causes wide-character libraries (e.g., <filename
@@ -93,22 +87,53 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--enable-pc-files</parameter></term>
+        <listitem>
+          <para>This switch generates and installs .pc files for pkg-config.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--without-normal</parameter></term>
+        <listitem>
+          <para>This switch disables building and installing most static libraries.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-db-install</parameter></term>
+        <listitem>
+          <para>This switch disables building the terminfo database: it is not
+          needed at this stage, and if <command>tic</command> is too old,
+          it cannot compile recent databases.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>This package has a test suite, but it can only be run after the
-    package has been installed.  The tests reside in the
-    <filename class="directory">test/</filename> directory.  See the
-    <filename>README</filename> file in that directory for further details.
-    </para>
-
     <para>Install the package:</para>
+<!-- TODO: check and document -->
+<screen><userinput remap="install">make DESTDIR=$LFS install
+  ln -s libncursesw.so $LFS/usr/lib/libncurses.so</userinput></screen>
+
+    <para>Move the shared libraries to the
+    <filename class="directory">/lib</filename> directory, where they are
+    expected to reside:</para>
+
+<screen><userinput remap="install">mv -v $LFS/usr/lib/libncursesw.so.6* $LFS/lib</userinput></screen>
+
+    <para>Because the libraries have been moved, one symlink points to
+    a non-existent file. Recreate it:</para>
+
+<screen><userinput remap="install">ln -sfv ../../lib/$(readlink $LFS/usr/lib/libncursesw.so) $LFS/usr/lib/libncursesw.so</userinput></screen>
 
-<screen><userinput remap="install">make install
-ln -s libncursesw.so /tools/lib/libncurses.so</userinput></screen>
 
   </sect2>