Use default locations for kbd files because custom locations

are no longer needed by the  boot scripts.


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

3 files changed, 24 insertions, 13 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 00c879113..f1416e24b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
 -->
 
     <listitem>
+      <para>2013-04-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Use default locations for kbd files 
+          because custom locations are no longer needed by the
+          boot scripts.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-04-19</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 537b7c751..fb7adc552 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -64,21 +64,20 @@ sed -i 's/resizecons.8 //' man/man8/Makefile.in</userinput></screen>
 
     <para>Prepare Kbd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd \
-  --disable-vlock</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-vlock</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
-
+<!--
       <varlistentry>
-        <term><parameter>--datadir=/lib/kbd</parameter></term>
+        <term><parameter>- -datadir=/lib/kbd</parameter></term>
         <listitem>
           <para>This option puts keyboard layout data in a directory that will
           always be on the root partition instead of the default <filename
           class="directory">/usr/share/kbd</filename>.</para>
        </listitem>
       </varlistentry>
-
+-->
       <varlistentry>
         <term><parameter>--disable-vlock</parameter></term>
         <listitem>
@@ -107,6 +106,7 @@ sed -i 's/resizecons.8 //' man/man8/Makefile.in</userinput></screen>
       such languages have to download working keymaps separately.</para>
     </note>
 
+<!--
     <para>Some of the scripts in the LFS-Bootscripts package depend on
     <command>kbd_mode</command>, <command>loadkeys</command>,
     <command>openvt</command>, and
@@ -115,12 +115,11 @@ sed -i 's/resizecons.8 //' man/man8/Makefile.in</userinput></screen>
     need to be on the root partition:</para>
 
 <screen><userinput remap="install">mv -v /usr/bin/{kbd_mode,loadkeys,openvt,setfont} /bin</userinput></screen>
-
+-->
     <para>If desired, install the documentation:</para>
 
-<screen><userinput remap="install">mkdir -v /usr/share/doc/kbd-&kbd-version;
-cp -R -v doc/* \
-         /usr/share/doc/kbd-&kbd-version;</userinput></screen>
+<screen><userinput remap="install">mkdir -v       /usr/share/doc/kbd-&kbd-version;
+cp -R -v doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
 
   </sect2>
 
@@ -129,7 +128,7 @@ cp -R -v doc/* \
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo,
@@ -138,7 +137,8 @@ cp -R -v doc/* \
         psfxtable), psfstriptable (link to psfxtable), psfxtable, <!--resizecons,-->
         setfont, setkeycodes, setleds, setmetamode,
         showconsolefont, showkey, unicode_start, and unicode_stop</seg>
-        <seg>/lib/kbd</seg>
+        <seg>/usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps,
+        /usr/share/unimaps</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/general.ent b/general.ent
index 7fdda1ff8..d0ba488be 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20130419">
-<!ENTITY releasedate "April 19, 2013">
+<!ENTITY version "SVN-20130423">
+<!ENTITY releasedate "April 23, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.4">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->