From e4f5f0466a88a432627ebc4ddc7bdd59bf2e9ee3 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Tue, 13 May 2003 05:09:24 +0000
Subject: [PATCH] Applied Zack's ncurses patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2596 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml    |  5 +++++
 chapter05/ncurses-inst.xml | 10 ++++------
 chapter06/ncurses-inst.xml |  9 +++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a535e4772..88d5ff246 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -74,6 +74,11 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 12th, 2003 [winkie]: Chapter 05 &amp; 06 - Installing
+Ncurses: In Chapter 6, symlink creation has been updated to include
+libcurses.*, and libncurses++.a has it's properties changed to 644.
+Chapter 5 doesn't need any libcurses.* so those are removed.</para></listitem>
+
 <listitem><para>May 12th, 2003 [gerard]: Chapter 06 - Basic Network: Added
 $(hostname) to /etc/hosts, without it Perl's hostname test doesn't
 pass.</para></listitem>
diff --git a/chapter05/ncurses-inst.xml b/chapter05/ncurses-inst.xml
index 2fcb18e7f..7418a7f3b 100644
--- a/chapter05/ncurses-inst.xml
+++ b/chapter05/ncurses-inst.xml
@@ -5,12 +5,10 @@
 
 <para><screen><userinput>patch -Np1 -i ../ncurses-&ncurses-version;-etip-2.patch
 patch -Np1 -i ../ncurses-&ncurses-version;-vsscanf.patch
-./configure --prefix=/stage1 --with-shared --without-debug --without-ada &amp;&amp;
-make &amp;&amp;
+./configure --prefix=/stage1 --with-shared --without-debug \
+&nbsp;&nbsp;&nbsp;&nbsp;--without-ada
+make
 make install
-chmod 755 /stage1/lib/*.5.3 &amp;&amp;
-ln -s libncurses.a /stage1/lib/libcurses.a
-ln -sf /stage1/lib/libncurses.so.5 /stage1/lib/libcurses.so</userinput></screen></para>
-
+chmod 755 /stage1/lib/*.5.3</userinput></screen></para>
 </sect2>
 
diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml
index 1aa80ec86..a61b32154 100644
--- a/chapter06/ncurses-inst.xml
+++ b/chapter06/ncurses-inst.xml
@@ -22,6 +22,10 @@
 
 <para><screen><userinput>chmod 755 /usr/lib/*.&ncurses-version;</userinput></screen></para>
 
+<para>And fix up a library that shouldn't be executable at all:</para>
+
+<para><screen><userinput>chmod 644 /usr/lib/libncurses++.a</userinput></screen></para>
+
 <para>Move the libraries to the <filename>/lib</filename> directory,
 where they're expected to reside:</para>
 
@@ -31,7 +35,8 @@ 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 ../../lib/libncurses.so.5 /usr/lib/libncurses.so &amp;&amp;
-ln -sf libncurses.so /usr/lib/libcurses.so</userinput></screen></para>
+<para><screen><userinput>ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
+ln -s libncurses.a /usr/lib/libcurses.a
+ln -s libncurses.so /usr/lib/libcurses.so</userinput></screen></para>
 </sect2>