diff --git a/appendixa/gawk-down.xml b/appendixa/gawk-down.xml
index 148fb9909..e1c9da275 100644
--- a/appendixa/gawk-down.xml
+++ b/appendixa/gawk-down.xml
@@ -2,8 +2,5 @@
Official Download Location
Gawk (&gawk-version;):
-
-
-Gawk Libexecdir Patch:
-
+
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ca728dde7..d0cfdf703 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,7 @@
Removed:
+gawk-3.1.3-libexecdir.patch
gcc-3.3.1-no_fixincludes-2.patch
gcc-3.3.1-suppress-libiberty.patch
grub-0.93-gcc33-1.patch
@@ -48,6 +49,9 @@
+January 6th, 2004 [greg]: Chapter 6 - Gawk: Removed the Gawk
+Libexecdir Patch. Closes Bug 303.
+
January 6th, 2004 [greg]: Upgraded to File-4.07, Linux-2.4.24
and Procps-3.1.15.
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 17d02ce32..1643e9b26 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -275,9 +275,6 @@ Ed Mkstemp Patch - &ed-patch-size;:
Expect Spawn Patch - &expect-patch-size;:
-Gawk Libexecdir Patch - &gawk-patch-size;:
-
-
GCC No-Fixincludes Patch - &gcc-nofixincludes-patch-size;:
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index a25cfaec5..1bba52e53 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -13,35 +13,9 @@ Estimated required disk space: &gawk-compsize;
Installation of Gawk
-First apply a patch to fix the following issues:
+Prepare Gawk for compilation:
-
-Gawk's default location for some of its executables is
-$prefix/libexec/awk. This location doesn't comply
-with the FHS, which never even mentions a directory called
-libexec. The patch makes it possible to pass a
---libexecdir switch to the configure script, so that we
-can use a more appropriate location for the grcat and
-pwcat binaries:
-/usr/lib/gawk.
-
-Gawk's default data directory is
-$prefix/share/awk. But package-specific
-directories should be named using the package name and version number
-(for example: gawk-7.7.2.) and not simply the package
-name, as there may be different versions of a package installed on the system.
-The patch changes the name of the data directory to the correct
-$prefix/share/gawk-&gawk-version;.
-
-The patch also ensures that this data directory, including its
-contents, is removed on a make uninstall.
-
-
-patch -Np1 -i ../&gawk-patch;
-
-Now prepare Gawk for compilation:
-
-./configure --prefix=/usr --libexecdir=/usr/lib/gawk
+./configure --prefix=/usr --libexecdir=/usr/lib
Compile the package:
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index f6f76a631..45c90caee 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -47,6 +47,13 @@ cd ../glibc-build
The meaning of the new configure options:
+--libexecdir=/usr/lib: This changes the
+location of the pt_chown program from its default of
+/usr/libexec to
+/usr/lib. The use of
+libexec is considered not FHS compliant because the FHS
+doesn't even mention it.
+
--with-headers=/usr/include: This
ensures that the kernel headers in /usr/include are used
for this build. If you don't pass this switch then the headers from
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 8a653aeef..2164285c8 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -15,9 +15,6 @@
-
-
-