From 8836e6026ab78f44476a8ed005836db507224253 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Fri, 3 Jan 2003 03:27:03 +0000
Subject: fixed the gawk patch - make uninstall won't wipe out /usr/bin anymore

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2275 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendixa/gawk-down.xml  |  1 -
 chapter01/changelog.xml  |  7 +++++++
 chapter04/gawk-patch.xml |  1 -
 chapter06/gawk-inst.xml  | 10 ----------
 entities/gawk.ent        |  2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/appendixa/gawk-down.xml b/appendixa/gawk-down.xml
index b7eb5a281..3980d8f11 100644
--- a/appendixa/gawk-down.xml
+++ b/appendixa/gawk-down.xml
@@ -5,6 +5,5 @@
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/>
 
 Gawk Patch (&gawk-patch-version;):
-<ulink url="&ftp;/"/>
 <ulink url="&http;/"/></literallayout></para>
 </sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6c4d4e7a7..ce2c40c44 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -13,6 +13,7 @@
 <listitem><para>binutils-2.13.2</para></listitem>
 <listitem><para>bison-1.75</para></listitem>
 <listitem><para>e2fsprogs-1.32</para></listitem>
+<listitem><para>gawk-3.1.1-3.patch</para></listitem>
 <listitem><para>gcc-3.2.1</para></listitem>
 <listitem><para>glibc-2.3.1</para></listitem>
 <listitem><para>glibc-2.3.1.patch</para></listitem>
@@ -56,6 +57,12 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>January 2nd, 2003 [gerard]: Chapter 06 - Fixed the gawk
+patch. <userinput>make uninstall</userinput> will no longer wipe out the
+<filename class="directory">/usr/bin</filename> directory. Also, renamed
+<filename class="directory">/usr/share/gawk</filename> to
+<filename class="directory">/usr/share/gawk-3.1.1</filename>.</para></listitem>
+
 <listitem><para>January 2nd, 2003 [gerard]: Replaced the glibc-2.3.1
 mega-patch with two separate patches (glibc-2.3.1-root-perl.patch and
 glibc-2.3.1-libnss.patch).</para></listitem>
diff --git a/chapter04/gawk-patch.xml b/chapter04/gawk-patch.xml
index 0a410b964..c1a910521 100644
--- a/chapter04/gawk-patch.xml
+++ b/chapter04/gawk-patch.xml
@@ -1,3 +1,2 @@
 Gawk Patch (&gawk-patch-version;) - &gawk-patch-size;:
-<ulink url="&ftp;/gawk-&gawk-patch-version;.patch"/>
 <ulink url="&http;/gawk-&gawk-patch-version;.patch"/>
diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml
index ceaedc8ef..7bb1ebe05 100644
--- a/chapter06/gawk-inst.xml
+++ b/chapter06/gawk-inst.xml
@@ -4,16 +4,6 @@
 <para>This package requires its patch to be applied before you can
 install it.</para>
 
-<para>Warning: do NOT run <userinput>make uninstall</userinput> on this
-package if you apply the patch to change the
-<filename class="directory">libexec</filename> directory definition. The
-<emphasis>uninstall</emphasis> rule in the <filename>Makefile</filename>
-file runs a command like <userinput>rm -rf
-&lt;libexecdir&gt;/*</userinput> Since we change the <filename
-class="directory">libexec</filename> directory to <filename
-class="directory">/usr/bin</filename> it'll run <userinput>rm -rf
-/usr/bin/*</userinput></para>
-
 <para>Install Gawk by running the following commands:</para>
 
 <para><screen><userinput>patch -Np1 -i ../gawk-&gawk-patch-version;.patch &amp;&amp;
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 21c9fa26b..e6960a4d5 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -18,7 +18,7 @@
 <!ENTITY gawk-contversion "3.1.1">
 <!ENTITY gawk-size "1,831 KB">
 <!ENTITY gawk-patch-size "1 KB">
-<!ENTITY gawk-patch-version "3.1.1-2">
+<!ENTITY gawk-patch-version "3.1.1-3">
 <!ENTITY gawk-dir "gawk-&gawk-version;">
 <!ENTITY gawk-package "gawk-&gawk-version;.tar.bz2">
 
-- 
cgit v1.2.3-54-g00ecf