aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml6
-rw-r--r--chapter05/gawk-inst.xml15
-rw-r--r--chapter07/chapter07.xml1
-rw-r--r--chapter07/loadkeys.xml31
-rw-r--r--index.xml1
5 files changed, 19 insertions, 35 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f1782947b..2ada6ca3b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -30,7 +30,11 @@
</para></listitem>
-<listitem><para>March 10th, 2002 [gerard]: Chapter 06 - Bzip2: Before
+<listitem><para>March 11th, 2002 [gerard]: Chapter 05 - Gawk: Added
+-Dre_max_failures=re_max_failures2 bug fix for glibc-2.1.x
+systems.</para></listitem>
+
+<listitem><para>March 11th, 2002 [gerard]: Chapter 06 - Bzip2: Before
installing, remove <filename>/usr/bin/bz*</filename>. The bzip2
installation doens't deal with existing files properly when making hard
links, so we remove the files first.</para></listitem>
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index 893f73d35..8d59f24a0 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -1,7 +1,20 @@
<sect2>
<title>Installation of Gawk</title>
-<para>Install Gawk by running the following commands:</para>
+<para>When installing Gawk using glibc-2.1.x on your base system,
+it may be necessary to use a fix to prevent a variable name conflict. The
+following commands can be used in this case. Note that these commands
+can also be used for other glibc versions so if you aren't sure, then
+use the first version.</para>
+
+<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
+./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+unset CPPFLAGS &amp;&amp;
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
+
+<para>If you are using a newer glibc version (2.2.x), you can use the
+following commands to install Gawk:</para>
<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
make LDFLAGS=-static &amp;&amp;
diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml
index 7d2b92367..f3a6b14d6 100644
--- a/chapter07/chapter07.xml
+++ b/chapter07/chapter07.xml
@@ -4,7 +4,6 @@
&c7-introduction;
&c7-usage;
-&c7-loadkeys;
&c7-setclock;
&c7-sysklogd;
&c7-hostname;
diff --git a/chapter07/loadkeys.xml b/chapter07/loadkeys.xml
deleted file mode 100644
index d7edb7056..000000000
--- a/chapter07/loadkeys.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<sect1 id="ch07-loadkeys">
-<title>Configuring the loadkeys script</title>
-<?dbhtml filename="loadkeys.html" dir="chapter07"?>
-
-<para>You only need to use the loadkeys script if you don't have a
-default 101 keys US keyboard layout.</para>
-
-<para>The /etc/sysconfig/keyboard file contains the information the
-loadkeys script needs to operate. This file contains the LAYOUT variable
-which tells loadkeys what keymap to load that corresponds with your
-keyboard.</para>
-
-<para>Create a new file <filename>/etc/sysconfig/keyboard</filename>
-by running the following:</para>
-
-<para><screen><userinput>cat &gt; /etc/sysconfig/keyboard &lt;&lt; "EOF"</userinput
->
-# Begin /etc/sysconfig/keyboard
-
-LAYOUT=&lt;path-to-keymap&gt;
-
-# End /etc/sysconfig/keyboard
-<userinput>EOF</userinput></screen></para>
-
-<para>Replace <userinput>&lt;path-to-keymap&gt;</userinput> with the
-path to the keymap you have selected. For example, if you have chosen the
-US keymap, you would replace it with
-<userinput>/usr/share/kbd/keymaps/i386/qwerty/us.map.gz</userinput></para>
-
-</sect1>
-
diff --git a/index.xml b/index.xml
index d64bbec68..23c0d29cf 100644
--- a/index.xml
+++ b/index.xml
@@ -338,7 +338,6 @@
<!ENTITY chapter07 SYSTEM "chapter07/chapter07.xml">
<!ENTITY c7-introduction SYSTEM "chapter07/introduction.xml">
<!ENTITY c7-usage SYSTEM "chapter07/usage.xml">
-<!ENTITY c7-loadkeys SYSTEM "chapter07/loadkeys.xml">
<!ENTITY c7-setclock SYSTEM "chapter07/setclock.xml">
<!ENTITY c7-sysklogd SYSTEM "chapter07/sysklogd.xml">
<!ENTITY c7-hostname SYSTEM "chapter07/hostname.xml">