Console(tools|data) -> Kbd

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

8 files changed, 37 insertions, 75 deletions

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 764f9d9b0..75314caa6 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -33,8 +33,7 @@
 &c6-binutils;
 &c6-bzip2;
 &c6-gettext;
-&c6-consoletools;
-&c6-consoledata;
+&c6-kbd;
 &c6-diffutils;
 &c6-e2fsprogs;
 &c6-fileutils;
diff --git a/chapter06/consoledata-inst.xml b/chapter06/consoledata-inst.xml
deleted file mode 100644
index 382be9e93..000000000
--- a/chapter06/consoledata-inst.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<sect2>
-<title>Installation of Console-data</title>
-
-<para>
-Replace &lt;path-to-kmap-file&gt; below with the correct path to the
-desired kmap.gz file. An example could be i386/qwerty/us.kmap.gz
-</para>
-
-<para>
-Install Console-data by running the following commands:
-</para>
-
-<blockquote><literallayout>
-
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd /usr/share/keymaps &amp;&amp;</userinput>
-	<userinput>ln -s &lt;path-to-kmap-file&gt; defkeymap.kmap.gz</userinput>
-
-</literallayout></blockquote>
-
-</sect2>
-
diff --git a/chapter06/consoledata.xml b/chapter06/consoledata.xml
deleted file mode 100644
index 9c8fbe922..000000000
--- a/chapter06/consoledata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<sect1 id="ch06-consoledata">
-<title>Installing Consoledata</title>
-
-&c6-consoledata-inst;
-&aa-consoledata-desc;
-
-</sect1>
diff --git a/chapter06/consoletools-inst.xml b/chapter06/consoletools-inst.xml
deleted file mode 100644
index a274c18da..000000000
--- a/chapter06/consoletools-inst.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<sect2>
-<title>Installation of Console-tools</title>
-
-<para>
-Before starting to install Console-tools a user has to unpack the
-console-tools-0.2.3.patch file.
-</para>
-
-<para>
-Install Console-tools by running the following commands:
-</para>
-
-<blockquote><literallayout>
-
-	<userinput>patch -Np1 -i ../console-tools-0.2.3.patch 
-		&amp;&amp;</userinput>
-	<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>cd doc/man &amp;&amp;</userinput>
-	<userinput>sed s/"@datadir@"/"\/usr\/share"/
-		consolechars.8.in &gt; consolechars.8 &amp;&amp;</userinput>
-	<userinput>sed s/"@datadir@"/"\/usr\/share"/
-		dumpkeys.1.in &gt; dumpkeys.1 &amp;&amp;</userinput>
-	<userinput>sed s/"@datadir@"/"\/usr\/share"/
-		loadkeys.1.in &gt; loadkeys.1 &amp;&amp;</userinput>
-	<userinput>cp *.1 /usr/share/man/man1 &amp;&amp;</userinput>
-	<userinput>cp *.4 /usr/share/man/man4 &amp;&amp;</userinput>
-	<userinput>cp *.5 /usr/share/man/man5 &amp;&amp;</userinput>
-	<userinput>cp *.8 /usr/share/man/man8</userinput>
-
-</literallayout></blockquote>
-
-</sect2>
-
diff --git a/chapter06/consoletools.xml b/chapter06/consoletools.xml
deleted file mode 100644
index d0f92c556..000000000
--- a/chapter06/consoletools.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<sect1 id="ch06-consoletools">
-<title>Installing Consoletools</title>
-
-&c6-consoletools-inst;
-&aa-consoletools-desc;
-
-</sect1>
diff --git a/chapter06/kbd-exp.xml b/chapter06/kbd-exp.xml
new file mode 100644
index 000000000..4aace3cec
--- /dev/null
+++ b/chapter06/kbd-exp.xml
@@ -0,0 +1,10 @@
+<sect2>
+<title>Command explanations</title>
+
+<para>
+<userinput>--datadir=/usr/share/kbd:</userinput> This puts the kbd data files
+(fonts, keymaps, and such) in the /usr/share/kbd directory, as the FHS suggests.
+</para>
+
+</sect2>
+
diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml
new file mode 100644
index 000000000..bbd4e35d0
--- /dev/null
+++ b/chapter06/kbd-inst.xml
@@ -0,0 +1,17 @@
+<sect2>
+<title>Installation of Kbd</title>
+
+<para>
+Install Kbd by running the following commands:
+</para>
+
+<blockquote><literallayout>
+
+	<userinput>./configure --datadir=/usr/share/kbd &amp;&amp;</userinput>
+	<userinput>make &amp;&amp;</userinput>
+	<userinput>make install</userinput>
+
+</literallayout></blockquote>
+
+</sect2>
+
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
new file mode 100644
index 000000000..016798052
--- /dev/null
+++ b/chapter06/kbd.xml
@@ -0,0 +1,9 @@
+<sect1 id="ch06-kbd">
+<title>Installing Kbd</title>
+
+&c6-kbd-inst;
+&c6-kbd-exp;
+&aa-kbd-desc;
+
+</sect1>
+