From 4428ad0165dbeab9056659ae94ed09cf7ae12328 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 30 May 2012 19:38:07 +0000
Subject: Correct the location of various package's man pages. Fixes #3097.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9867 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/bzip2.xml   | 4 ++++
 chapter06/ncurses.xml | 3 ++-
 chapter06/shadow.xml  | 6 ------
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 97840c588..32b5a2d2b 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -51,6 +51,10 @@
 
 <screen><userinput remap="pre">sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile</userinput></screen>
 
+    <para>Ensure the man pages are installed into the correct location:</para>
+
+<screen><userinput remap="pre">sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile</userinput></screen>
+
     <para>Prepare Bzip2 for compilation with:</para>
 
 <screen><userinput remap="make">make -f Makefile-libbz2_so
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 60604be63..d3da0d7bd 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -53,7 +53,8 @@
 
     <para>Prepare Ncurses for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --with-shared --without-debug --enable-widec</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --mandir=/usr/share/man --with-shared \
+            --without-debug --enable-widec</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 8dd1930e7..6c7e8afcd 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -49,12 +49,6 @@
       command below.</para>
     </note>
 
-    <para>Apply a patch to fix an issue when running various programs from this
-    package when they are used when the <command>nscd</command> daemon is not
-    running:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&shadow-nscd-patch;</userinput></screen>
-
     <para>Disable the installation of the <command>groups</command> program
     and its man pages, as Coreutils provides a better version:</para>
 
-- 
cgit v1.2.3-54-g00ecf