added --libexecdir

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

7 files changed, 9 insertions, 20 deletions

diff --git a/appendixa/appendixa.xml b/appendixa/appendixa.xml
index 36ab1dcf6..c16727578 100644
--- a/appendixa/appendixa.xml
+++ b/appendixa/appendixa.xml
@@ -10,7 +10,6 @@
 &aa-binutils;
 &aa-bison;
 &aa-bzip2;
-&aa-chroot;
 &aa-diffutils;
 &aa-e2fsprogs;
 &aa-ed;
diff --git a/appendixa/chroot-dep.xml b/appendixa/chroot-dep.xml
deleted file mode 100644
index 75f0f86b9..000000000
--- a/appendixa/chroot-dep.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<sect2>
-<title>Dependencies</title>
-
-<para>Chroot needs the following to be installed:</para>
-
-<literallayout>
-bash: bash
-sh-utils: env
-</literallayout>
-
-</sect2>
-
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b591a3109..9a97ecace 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -33,6 +33,10 @@
 
 </para></listitem>
 
+<listitem><para>March 16th, 2002 [gerard]: Chapter 06+Appendix A: Removed
+the chroot dependencies. It's not a package so it's a bit out of
+place.</para></listitem>
+
 <listitem><para>March 16th, 2002 [gerard]: Chapter 05+06 - Gawk: Added
 commands to sed the <filename>awklib/Makefile.in</filename> file to change
 the <emphasis>datadir</emphasis> and <emphasis>libexecdir</emphasis>
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index 0c216232f..9bea62ee3 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -13,7 +13,8 @@ sed -e '/^datadir/s/awk/gawk/' \
 -e '/^libexecdir/s%/awk%%' Makefile.in.backup &gt; Makefile.in &amp;&amp;
 cd .. &amp;&amp;
 export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
-./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+./configure --prefix=$LFS/usr --disable-nls \
+	--libexecdir=$LFS/usr/bin &amp;&amp;
 unset CPPFLAGS &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
@@ -26,7 +27,8 @@ cp Makefile.in Makefile.in.backup &amp;&amp;
 sed -e '/^datadir/s/awk/gawk/' \
 -e '/^libexecdir/s%/awk%%' Makefile.in.backup &gt; Makefile.in &amp;&amp;
 cd .. &amp;&amp;
-./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+./configure --prefix=$LFS/usr --disable-nls \
+	--libexecdir=$LFS/usr/bin &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml
index 745396f4d..120eef684 100644
--- a/chapter06/chroot.xml
+++ b/chapter06/chroot.xml
@@ -37,7 +37,5 @@ book.</para>
 <para>Note that the bash prompt will contain "I have no name!" This is
 normal because Glibc hasn't been installed yet.</para>
 
-&aa-chroot-dep;
-
 </sect1>
 
diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml
index c6d4a6067..0796a41c4 100644
--- a/chapter06/gawk-inst.xml
+++ b/chapter06/gawk-inst.xml
@@ -8,7 +8,7 @@ cp Makefile.in Makefile.in.backup &amp;&amp;
 sed -e '/^datadir/s/awk/gawk/' \
 -e '/^libexecdir/s%/awk%%' Makefile.in.backup &gt; Makefile.in &amp;&amp;
 cd .. &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+./configure --prefix=/usr --libexecdir=/usr/bin &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/index.xml b/index.xml
index c2cdde2de..8dbe83316 100644
--- a/index.xml
+++ b/index.xml
@@ -386,8 +386,6 @@
 <!ENTITY aa-bzip2-desc SYSTEM "appendixa/bzip2-desc.xml">
 <!ENTITY aa-bzip2-dep SYSTEM "appendixa/bzip2-dep.xml">
 <!ENTITY aa-bzip2-down SYSTEM "appendixa/bzip2-down.xml">
-<!ENTITY aa-chroot SYSTEM "appendixa/chroot.xml">
-<!ENTITY aa-chroot-dep SYSTEM "appendixa/chroot-dep.xml">
 <!ENTITY aa-diffutils SYSTEM "appendixa/diffutils.xml">
 <!ENTITY aa-diffutils-desc SYSTEM "appendixa/diffutils-desc.xml">
 <!ENTITY aa-diffutils-dep SYSTEM "appendixa/diffutils-dep.xml">