Changeset 3871491

Timestamp:

Feb 21, 2006, 2:19:49 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

dba647a

Parents:

665552c

Message:

r1123@server (orig r1121): chris | 2006-02-01 00:33:35 -0800
Added a fix for a problem with makewhatis

Files:

• final-system/common/man.xml (modified) (6 diffs)
• final-system/multilib/man.xml (modified) (3 diffs)
• general.ent (modified) (2 diffs)
• introduction/common/changelog.xml (modified) (1 diff)

final-system/common/man.xml

@@ -37 +37 @@
     <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@-is@&amp;R@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
@@ -50 +51 @@
 <screen os="e"><userinput>sed -i 's@MANPATH./usr/man@#&amp;@g' src/man.conf.in</userinput></screen>
 
-    <para os="f">Prepare Man for compilation:</para>
-
-<screen os="g"><userinput>./configure -confdir=/etc</userinput></screen>
-
-    <variablelist os="h">
+    <para os="f">Finally, correct a syntax error in the
+    <command>makewhatis</command> script:</para>
+
+<screen os="g"><userinput>sed -i 's/)) |/) |/' src/makewhatis.sh</userinput></screen>
+
+    <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>
 
@@ -67 +73 @@
     </variablelist>
 
-    <para os="i">Compile the package:</para>
-
-<screen os="j"><userinput>make</userinput></screen>
-
-    <para os="k">Install the package:</para>
-
-<screen os="l"><userinput>make install</userinput></screen>
-
-    <note os="m">
+    <para os="k">Compile the package:</para>
+
+<screen os="l"><userinput>make</userinput></screen>
+
+    <para os="m">Install the package:</para>
+
+<screen os="n"><userinput>make install</userinput></screen>
+
+    <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
@@ -86 +92 @@
     </note>
 
-    <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
     following:</para>
 
-<screen os="o">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
-
-    <para os="p">Note that <quote>latin1</quote> should be used even if it is not
+<screen os="q">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
+
+    <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
@@ -105 +111 @@
     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
@@ -112 +118 @@
     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>

final-system/multilib/man.xml

@@ -46 +46 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -52 +54 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -92 +92 @@
     xpointer="xpointer(//*[@os='r'])"/>
 
+    <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'])"/>
+
   </sect2>
 

general.ent

@@ -1 +1 @@
 <?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">
@@ -15 +15 @@
 <!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}]" -->

introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <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>
       <itemizedlist>