From 1612f40eb9f1b8ea766ea308e40d6b3fe14f6fc5 Mon Sep 17 00:00:00 2001 From: Alex Gronenwoud Date: Wed, 22 Oct 2003 22:26:19 +0000 Subject: Correcting Gawk's patching explanation. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3028 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/gawk-shortdesc.xml | 4 ++-- chapter06/gawk-inst.xml | 44 ++++++++++++++++++++------------------------ 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/appendixa/gawk-shortdesc.xml b/appendixa/gawk-shortdesc.xml index 200b114d8..67dd53c06 100644 --- a/appendixa/gawk-shortdesc.xml +++ b/appendixa/gawk-shortdesc.xml @@ -5,7 +5,7 @@ Gawk is an awk implementation that is used to manipulate text files. -Installed programs: awk, gawk, gawk-&gawk-version;, -grcat, igawk, pgawk, pgawk-&gawk-version; and pwcat +Installed programs: awk (link to gawk), gawk, +gawk-&gawk-version;, grcat, igawk, pgawk, pgawk-&gawk-version; and pwcat diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml index b3eeafcb7..d5b5dd9d7 100644 --- a/chapter06/gawk-inst.xml +++ b/chapter06/gawk-inst.xml @@ -3,32 +3,28 @@ Installation of Gawk -Before installing the Gawk package you have to apply a patch, -which fixes the following issues: +First apply a patch to fix the following issues: -Gawk's default location for libexecdir is $prefix/libexecdir/awk. This location doesn't -comply with FHS (which never mentions a directory called -libexecdir). - -The patch allows us to pass ---libexecdir to the configure script (without gawk -tacking on /awk to the end), so that we can use a more appropriate location -for gawk's libexecdir (/usr/bin in -the book). - -The default data directory for gawk is $prefix/share/awk. A package specific -directory should be named using the package and version (like -gawk-&gawk-version; instead of awk) because there may be more than one awk -interpreter on a system (and more than one version of gawk). The patch changes -this to $prefix/share/gawk-&gawk-version; -to be more correct. - -The patch ensures that this directory ($prefix/share/gawk-&gawk-version;) is removed along -with its contents on a make uninstall. +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/bin. + +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; -- cgit v1.2.3-54-g00ecf