aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2002-09-29 00:07:32 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2002-09-29 00:07:32 +0000
commitab46b4e6a8619913903ffd85af84ffaf4e367590 (patch)
treeabd8a8856af6525225ef00db758125447528f5a4 /chapter06
parent0d1de9459fdd63c618bdb6936b0024b577ed7746 (diff)
added man patch to replace sed, and added gcc-3.2-nofixincludes.patch
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2142 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/man-exp.xml10
-rw-r--r--chapter06/man-inst.xml7
2 files changed, 8 insertions, 9 deletions
diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml
index fc09310b2..b5e88a17a 100644
--- a/chapter06/man-exp.xml
+++ b/chapter06/man-exp.xml
@@ -8,10 +8,12 @@ where a program is found. By appending /usr/bin:/bin to PATH for the
./configure command, we make sure that man doesn't use the /static versions
of our programs.</para>
-<para><userinput>sed '/^PAGER/s/-is/-isR/'</userinput>:
-The version of groff we installed supports SGR (Set Graphics Rendition)
-escape sequences. In order for our man pages to display properly, we
-add the R argument to the call for the less pager.</para>
+<para><userinput>patch -Np1 -i ../man-&man-patch-version;.patch:</userinput>
+This patch comments out one of the files in the <filename>man.conf</filename>
+file (MANPATH /usr/man) because it will create redundant results when using
+programs like <userinput>whatis</userinput>. It also adds the
+<emphasis>-R</emphasis> option to the <emphasis>PAGER</emphasis> variable so
+man pages are displayed properly.</para>
</sect2>
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index 350228636..ad73cabdb 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -3,13 +3,10 @@
<para>Run the following commands to install man:</para>
-<para><screen><userinput>PATH=$PATH:/usr/bin:/bin \
+<para><screen><userinput>patch -Np1 -i ../man-&man-patch-version;.patch &amp;&amp;
+PATH=$PATH:/usr/bin:/bin \
&nbsp;&nbsp;&nbsp;&nbsp;./configure -default -confdir=/etc &amp;&amp;
make &amp;&amp;
-cp src/man.conf{,.backup} &amp;&amp;
-sed -e '/^PAGER/s/-is/-isR/' \
-&nbsp;&nbsp;&nbsp;&nbsp;-e 's%MANPATH[[:space:]]/usr/man%#MANPATH /usr/man%' \
-&nbsp;&nbsp;&nbsp;&nbsp;src/man.conf.backup > src/man.conf &amp;&amp;
make install</userinput></screen></para>
<para>Note: If you wish to disable SGR escape sequences, you should