diff options
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/findutils-exp.xml | 13 | ||||
| -rw-r--r-- | chapter06/findutils-inst.xml | 45 | ||||
| -rw-r--r-- | chapter06/findutils.xml | 5 |
3 files changed, 27 insertions, 36 deletions
diff --git a/chapter06/findutils-exp.xml b/chapter06/findutils-exp.xml deleted file mode 100644 index 9902a8916..000000000 --- a/chapter06/findutils-exp.xml +++ /dev/null @@ -1,13 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput>: -This patch fixes some compilation errors by avoiding a variable conflict -and changing some bad syntax.</para> - -<para><userinput>patch -Np1 -i ../findutils-&findutils-segfault-patch-version;-segfault.patch</userinput>: -This patch fixes a segfault in <userinput>locate</userinput> when encountering -a very long path name.</para> - -</sect2> - diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml index 9eeef3da0..b186dcb38 100644 --- a/chapter06/findutils-inst.xml +++ b/chapter06/findutils-inst.xml @@ -1,30 +1,35 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installing Findutils</title> -<para>This package requires its patch to be applied before you can -install it.</para> +<para>A patch must be applied in order to prevent compilation +errors. The patch fixes a variable conflict and some bad syntax. +Issue the following command to apply this patch:</para> -<para>Install Findutils by running the following commands:</para> +<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput></screen></para> -<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch && -patch -Np1 -i ../findutils-&findutils-segfault-patch-version;-segfault.patch && -CPPFLAGS="-D_GNU_SOURCE" ./configure --prefix=/usr && -make libexecdir=/usr/bin && -make libexecdir=/usr/bin install</userinput></screen></para> +<para>The <userinput>locate</userinput> program from Findutils may +segfault if it encounters a long path name. To correct this, apply +the second patch:</para> -</sect2> -<sect2> -<title>FHS compliance notes</title> +<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-segfault-patch-version;-segfault.patch</userinput></screen></para> + +<para>Prepare Findutils to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> <para>By default, the location of the updatedb database is in /usr/var. -If you would rather be FHS compliant, you may wish to use another -location. The following commands use the database file -<filename>/var/lib/misc/locatedb</filename> which is FHS compliant.</para> - -<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch && -patch -Np1 -i ../findutils-&findutils-segfault-patch-version;-segfault.patch && -./configure --prefix=/usr && -make localstatedir=/var/lib/misc libexecdir=/usr/bin && -make localstatedir=/var/lib/misc libexecdir=/usr/bin install</userinput></screen></para> +To make the location of <filename>/var/lib/misc/locatedb</filename> file +FHS compliant, pass the <emphasis>localstatedir=/var/lib/misc</emphasis> +option to both <userinput>make</userinput> commands below.</para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make libexecdir=/usr/bin</userinput></screen></para> + +<para>Finish installing the package:</para> + +<para><screen><userinput>make libexecdir=/usr/bin install</userinput></screen></para> </sect2> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index 72f9d8f0a..6918deb5e 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -5,10 +5,9 @@ <screen>Estimated build time: &findutils-time; Estimated required disk space: &findutils-compsize;</screen> -&c6-findutils-inst; -&c6-findutils-exp; -&aa-findutils-desc; +&aa-findutils-shortdesc; &aa-findutils-dep; +&c6-findutils-inst; </sect1> |