From 47d4ffad9bab231b0aca5f66e694247e1f9d6c8c Mon Sep 17 00:00:00 2001
From: Dan Nichilson <dnicholson@linuxfromscratch.org>
Date: Sat, 24 Feb 2007 05:30:22 +0000
Subject: [PATCH] Removed /usr/local/man lines from man_db.conf

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7936 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter06/man-db.xml    | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a1c61ccfd..82e05857a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2007-02-23</para>
       <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Removed /usr/local/man lines from man_db.conf
+          to prevent redundant results. Reported by Chris Staub.</para>
+        </listitem>
         <listitem>
           <para>[dnicholson] - Applied a patch from Chris Staub to fix some
           commands and text on the kernel file systems, E2fsprogs and
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 82b374447..7ff5e068c 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -48,11 +48,11 @@ mv man/ja{_JP.eucJP,} &amp;&amp;
 sed -i 's,\*_\*,??,' man/Makefile.in</userinput></screen>
 
     <para>The second change is a <command>sed</command> substitution to delete
-    the <quote>/usr/man</quote> lines in the <filename>man_db.conf</filename>
-    file to prevent redundant results when using programs such as
-    <command>whatis</command>:</para>
+    the <quote>/usr/man</quote> and <quote>/usr/local/man</quote> lines in
+    the <filename>man_db.conf</filename> file to prevent redundant results
+    when using programs such as <command>whatis</command>:</para>
 
-<screen><userinput>sed -i '/\t\/usr\/man/d' src/man_db.conf.in</userinput></screen>
+<screen><userinput>sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in</userinput></screen>
 
     <para>The third change accounts for programs that Man-DB should be able
     to find at runtime, but that haven't been installed yet:</para>