Merged r8536 and r8537 from trunk to jh branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8538 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter01/changelog.xml

@@ -36,6 +36,23 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2008-04-23</para>
+      <itemizedlist>
+	<listitem>
+	  <para>[jhuntwork] - Fixed behavior in kbd where man pages
+          for optional programs that aren't built are installed.
+	  Thanks Greg Schafer for spotting this.
+	  </para>
+	</listitem>
+        <listitem>
+          <para>[jhuntwork] - Fixed kbd to install getkeycodes,
+	  setkeycodes and resizecons. Also moved loadkeys to /bin from
+          /usr/bin. Thanks, Greg Schafer.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2008-04-22</para>
       <itemizedlist>

chapter06/kbd.xml

@@ -49,6 +49,25 @@
     <para>After patching, the Backspace key generates the character with code 127,
     and the Delete key generates a well-known escape sequence.</para>
 
+    <para>In this version of Kbd the instructions to build
+    <filename>getkeycodes</filename>, <filename>setkeycodes</filename> and
+    <filename>resizecons</filename> do not get passed over to the generated
+    <filename>Makefile</filename> as they should. So that these programs
+    are built and installed add two lines to the top of
+    <filename>src/Makefile.in</filename>:
+    </para>
+
+<screen><userinput remap="pre">sed -i -e '1i KEYCODES_PROGS = @KEYCODES_PROGS@' \
+    -e '1i RESIZECONS_PROGS = @RESIZECONS_PROGS@' src/Makefile.in</userinput></screen>
+
+    <para>This version of Kbd will also install man pages for optional programs
+    even if we don't use the <parameter>--enable-optional-progs</parameter>
+    option to build them. Fix this behavior:</para>
+
+<screen><userinput remap="pre">var=OPTIONAL_PROGS
+sed -i "s/ifdef $var/ifeq (\$($var),yes)/" man/Makefile.in
+unset var</userinput></screen>
+
     <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd</userinput></screen>
@@ -85,12 +104,13 @@
     </note>
 
     <para>Some of the scripts in the LFS-Bootscripts package depend on
-    <command>kbd_mode</command>, <command>openvt</command>, and
+    <command>kbd_mode</command>, <command>loadkeys</command>,
+    <command>openvt</command>, and
     <command>setfont</command>.  As <filename class="directory">/usr</filename>
     may not be available during the early stages of booting, those binaries
     need to be on the root partition:</para>
 
-<screen><userinput remap="install">mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen>
+<screen><userinput remap="install">mv -v /usr/bin/{kbd_mode,loadkeys,openvt,setfont} /bin</userinput></screen>
 
   </sect2>
 

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20080422">
-<!ENTITY releasedate "April 22, 2008">
+<!ENTITY version "SVN-JH-20080423">
+<!ENTITY releasedate "April 23, 2008">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->