r1121 - in trunk/BOOK: . final-system/common final-system/multilib introduction/common

chris at linuxfromscratch.org chris at linuxfromscratch.org
Wed Feb 1 00:33:36 PST 2006

Author: chris
Date: 2006-02-01 01:33:35 -0700 (Wed, 01 Feb 2006)
New Revision: 1121

Added a fix for a problem with makewhatis

Modified: trunk/BOOK/final-system/common/man.xml
--- trunk/BOOK/final-system/common/man.xml	2006-02-01 05:36:41 UTC (rev 1120)
+++ trunk/BOOK/final-system/common/man.xml	2006-02-01 08:33:35 UTC (rev 1121)
@@ -36,24 +36,30 @@
     <para os="a">A few adjustments need to be made to the sources of Man.</para>
-    <para os="b">This a <command>sed</command> substitution to add the
-    <option>-R</option> switch to the <envar>PAGER</envar> variable so
-    that escape sequences are properly handled by Less:</para>
+    <para os="b">First, a <command>sed</command> substitution is
+    needed to add the <option>-R</option> switch to the
+    <envar>PAGER</envar> variable so that escape sequences are
+    properly handled by Less:</para>
 <screen os="c"><userinput>sed -i 's at -is@&R at g' configure</userinput></screen>
-    <para os="d">This a <command>sed</command> substitution to comment out the
+    <para os="d">Another <command>sed</command> substitution comments out the
     <quote>MANPATH /usr/man</quote> line in the <filename>man.conf</filename>
     file to prevent redundant results when using programs such as
 <screen os="e"><userinput>sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in</userinput></screen>
-    <para os="f">Prepare Man for compilation:</para>
+    <para os="f">Finally, correct a syntax error in the
+    <command>makewhatis</command> script:</para>
-<screen os="g"><userinput>./configure -confdir=/etc</userinput></screen>
+<screen os="g"><userinput>sed -i 's/)) |/) |/' src/makewhatis.sh</userinput></screen>
-    <variablelist os="h">
+    <para os="h">Prepare Man for compilation:</para>
+<screen os="i"><userinput>./configure -confdir=/etc</userinput></screen>
+    <variablelist os="j">
       <title>The meaning of the configure options:</title>
@@ -66,15 +72,15 @@
-    <para os="i">Compile the package:</para>
+    <para os="k">Compile the package:</para>
-<screen os="j"><userinput>make</userinput></screen>
+<screen os="l"><userinput>make</userinput></screen>
-    <para os="k">Install the package:</para>
+    <para os="m">Install the package:</para>
-<screen os="l"><userinput>make install</userinput></screen>
+<screen os="n"><userinput>make install</userinput></screen>
-    <note os="m">
+    <note os="o">
       <para>If you will be working on a terminal that does not support
       text attributes such as color and bold, you can disable Select
       Graphic Rendition (SGR) escape sequences by editing the
@@ -85,14 +91,14 @@
       that do not support SGR.</para>
-    <para os="n">If the character set of the locale uses 8-bit characters, search
+    <para os="p">If the character set of the locale uses 8-bit characters, search
     for the line beginning with <quote>NROFF</quote> in
     <filename>/etc/man.conf</filename>, and verify that it matches the
-<screen os="o">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
+<screen os="q">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
-    <para os="p">Note that <quote>latin1</quote> should be used even if it is not
+    <para os="r">Note that <quote>latin1</quote> should be used even if it is not
     the character set of the locale. The reason is that, according to the
     specification, <command>groff</command> has no means of typesetting
     characters outside International Organization for Standards (ISO) 8859-1
@@ -104,14 +110,14 @@
     ormatted result is really in the same encoding as input, and therefore
     it is usable as the input for a pager.</para>
-    <para os="q">This does not solve the problem of a non-working
+    <para os="s">This does not solve the problem of a non-working
     <command>man2dvi</command> program for localized man pages in
     non-ISO 8859-1 locales. Also, it does not work with multibyte
     character sets. The first problem does not currently have a solution.
     The second issue is not of concern because the LFS installation does
     not support multibyte character sets.</para>
-    <para os="r">Additional information with regards to the compression of
+    <para os="t">Additional information with regards to the compression of
     man and info pages can be found in the BLFS book at
     <ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/>.</para>

Modified: trunk/BOOK/final-system/multilib/man.xml
--- trunk/BOOK/final-system/multilib/man.xml	2006-02-01 05:36:41 UTC (rev 1120)
+++ trunk/BOOK/final-system/multilib/man.xml	2006-02-01 08:33:35 UTC (rev 1121)
@@ -45,16 +45,16 @@
-<screen os="g"><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
+<screen os="i"><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -91,6 +91,14 @@
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='t'])"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/general.ent
--- trunk/BOOK/general.ent	2006-02-01 05:36:41 UTC (rev 1120)
+++ trunk/BOOK/general.ent	2006-02-01 08:33:35 UTC (rev 1121)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "CLFS-SVN-20060131">
+<!ENTITY version "CLFS-SVN-20060201">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
 <!ENTITY version-x86_64-64 "&version;-x86_64-Pure64">
@@ -14,7 +14,7 @@
 <!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
 <!ENTITY version-alpha "&version;-ALPHA">
-<!ENTITY releasedate "January 31, 2006">
+<!ENTITY releasedate "February 1, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->

Modified: trunk/BOOK/introduction/common/changelog.xml
--- trunk/BOOK/introduction/common/changelog.xml	2006-02-01 05:36:41 UTC (rev 1120)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-02-01 08:33:35 UTC (rev 1121)
@@ -37,6 +37,17 @@
+      <para>February 1, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added a sed substitution to man
+          instructions to fix an error in the
+          <command>makewhatis</command> script.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
       <para>January 31, 2006</para>

More information about the cross-lfs mailing list