aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorGreg Schafer <greg@linuxfromscratch.org>2004-01-07 02:15:05 +0000
committerGreg Schafer <greg@linuxfromscratch.org>2004-01-07 02:15:05 +0000
commitc1b2c648aa6c5a3636b4a893f8d42c888355e9a1 (patch)
tree7a58ae7b912df89f8983f76bb28b029f5add6438 /chapter06
parentb8d6db77e9335bf5d94f9fee5281245b48008b48 (diff)
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
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/gawk.xml32
-rw-r--r--chapter06/glibc.xml7
2 files changed, 10 insertions, 29 deletions
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