From b175687da8cddb861ee6725d52391ee829e10ad8 Mon Sep 17 00:00:00 2001
From: Timothy Bauscher <timothy@linuxfromscratch.org>
Date: Sun, 11 May 2003 19:12:19 +0000
Subject: More from Zack: Ncurses symlinks fixes, procps removal of XSCPT=,
 --without-debug for ncurses.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2568 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/coreutils-inst.xml | 11 +++++++++--
 chapter06/ncurses-inst.xml   |  8 ++++----
 chapter06/procps-inst.xml    |  8 +-------
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml
index 1d2df60b2..f1225d77c 100644
--- a/chapter06/coreutils-inst.xml
+++ b/chapter06/coreutils-inst.xml
@@ -4,9 +4,16 @@
 <title>Installation of Coreutils</title>
 
 <para>Normally the functionality of uname is somewhat broken, in that
-the -p switch always returns "unknown". This patch fixes that behaviour:</para>
+the -p switch always returns "unknown". This patch fixes that behaviour
+for Intel architectures:</para>
 
-<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch</userinput></screen></para>
+
+<para>We do not want Coreutils to install it's version of the hostname
+binary, because it is inferior to the version provided by Net-tools.
+Prevent the installation of hostname with this patch:</para>
+
+<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-hostname-patch-version;.patch</userinput></screen></para>
 
 <para>Prepare Coreutils to be compiled:</para>
 
diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml
index 65856f312..8a56f31e4 100644
--- a/chapter06/ncurses-inst.xml
+++ b/chapter06/ncurses-inst.xml
@@ -7,7 +7,8 @@
 
 <para>Prepare Ncurses to be compiled:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --with-shared</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --with-shared &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--without-debug</userinput></screen></para>
 
 <para>Continue with compiling the package:</para>
 
@@ -30,8 +31,7 @@ where they're expected to reside:</para>
 <filename>/lib</filename>, a few symlinks are currently pointing
 towards non-existing files. Recreate those symlinks:</para>
 
-<para><screen><userinput>ln -sf libncurses.a /usr/lib/libcurses.a &amp;&amp;
-ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so &amp;&amp;
-ln -sf ../../lib/libncurses.so.5 /usr/lib/libcurses.so</userinput></screen></para>
+<para><screen><userinput>ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so &amp;&amp;
+ln -sf libncurses.so /usr/lib/libcurses.so</userinput></screen></para>
 </sect2>
 
diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml
index 619457799..c9b8fd8d5 100644
--- a/chapter06/procps-inst.xml
+++ b/chapter06/procps-inst.xml
@@ -16,13 +16,7 @@ the patch:</para>
 
 <para>Finish installing the package:</para>
 
-<para><screen><userinput>make XSCPT="" install</userinput></screen></para>
-
-<para>The <emphasis>XSCPT</emphasis> option will set the Makefile
-variable XSCPT to an empty value so that XConsole installation is
-disabled. Otherwise, <userinput>make install</userinput> tries to
-copy the file XConsole to /usr/X11R6/lib/X11/app-defaults. That
-directory does not exist because X is not installed.</para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 
-- 
cgit v1.2.3-54-g00ecf