Chapter 6 - Gawk: Removed the Gawk Libexecdir Patch. Closes Bug 303.

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

6 files changed, 15 insertions, 39 deletions

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 @@
 <title>Official Download Location</title>
 
 <literallayout>Gawk (&gawk-version;): 
-<ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/>
-
-Gawk Libexecdir Patch:
-<ulink url="&patches-root;&gawk-patch;"/></literallayout>
+<ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/></literallayout>
 </sect2>
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 @@
 
 <listitem><para>Removed:</para>
 <itemizedlist>
+<listitem><para>gawk-3.1.3-libexecdir.patch</para></listitem>
 <listitem><para>gcc-3.3.1-no_fixincludes-2.patch</para></listitem>
 <listitem><para>gcc-3.3.1-suppress-libiberty.patch</para></listitem>
 <listitem><para>grub-0.93-gcc33-1.patch</para></listitem>
@@ -48,6 +49,9 @@
 </itemizedlist>
 </listitem>
 
+<listitem><para>January 6th, 2004 [greg]: Chapter 6 - Gawk: Removed the Gawk
+Libexecdir Patch. Closes Bug 303.</para></listitem>
+
 <listitem><para>January 6th, 2004 [greg]: Upgraded to File-4.07, Linux-2.4.24
 and Procps-3.1.15.</para></listitem>
 
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;:
 <ulink url="&patches-root;&expect-patch;"/>
 
-Gawk Libexecdir Patch - &gawk-patch-size;:
-<ulink url="&patches-root;&gawk-patch;"/>
-
 GCC No-Fixincludes Patch - &gcc-nofixincludes-patch-size;:
 <ulink url="&patches-root;&gcc-nofixincludes-patch;"/>
 
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;</screen>
 <sect2>
 <title>Installation of Gawk</title>
 
-<para>First apply a patch to fix the following issues:</para>
-
-<itemizedlist>
-<listitem><para>Gawk's default location for some of its executables is
-<filename>$prefix/libexec/awk</filename>. This location doesn't comply
-with the FHS, which never even mentions a directory called
-<filename>libexec</filename>. The patch makes it possible to pass a
-<emphasis>--libexecdir</emphasis> switch to the configure script, so that we
-can use a more appropriate location for the <userinput>grcat</userinput> and
-<userinput>pwcat</userinput> binaries:
-<filename>/usr/lib/gawk</filename>.</para></listitem>
-
-<listitem><para>Gawk's default data directory is
-<filename>$prefix/share/awk</filename>. But package-specific
-directories should be named using the package name and version number
-(for example: <filename>gawk-7.7.2.</filename>) 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
-<filename>$prefix/share/gawk-&gawk-version;</filename>.</para></listitem>
-
-<listitem><para>The patch also ensures that this data directory, including its
-contents, is removed on a <emphasis>make uninstall</emphasis>.</para></listitem>
-</itemizedlist>
-
-<screen><userinput>patch -Np1 -i ../&gawk-patch;</userinput></screen>
-
-<para>Now prepare Gawk for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/gawk</userinput></screen>
+<para>Prepare Gawk for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
 
 <para>Compile the package:</para>
 
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</userinput></screen>
 <para>The meaning of the new configure options:</para>
 
 <itemizedlist>
+<listitem><para><userinput>--libexecdir=/usr/lib</userinput>: This changes the
+location of the <filename>pt_chown</filename> program from its default of 
+<filename class="directory">/usr/libexec</filename> to
+<filename class="directory">/usr/lib</filename>. The use of
+<emphasis>libexec</emphasis> is considered not FHS compliant because the FHS
+doesn't even mention it.</para></listitem>
+
 <listitem><para><userinput>--with-headers=/usr/include</userinput>: This
 ensures that the kernel headers in <filename>/usr/include</filename> 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 @@
 <!ENTITY gawk-package "gawk-&gawk-version;.tar.bz2">
 <!ENTITY gawk-size "1,596 KB">
 
-<!ENTITY gawk-patch "gawk-&gawk-version;-libexecdir.patch">
-<!ENTITY gawk-patch-size "1 KB">
-
 <!ENTITY gawk-compsize-tools "17 MB">
 <!ENTITY gawk-time-tools "0.2 SBU">