aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter05/bash-inst.xml35
-rw-r--r--chapter05/bash.xml36
-rw-r--r--chapter05/binutils-pass1-inst.xml106
-rw-r--r--chapter05/binutils-pass1.xml107
-rw-r--r--chapter05/binutils-pass2-inst.xml68
-rw-r--r--chapter05/binutils-pass2.xml69
-rw-r--r--chapter05/bzip2-inst.xml12
-rw-r--r--chapter05/bzip2.xml13
-rw-r--r--chapter05/coreutils-inst.xml34
-rw-r--r--chapter05/coreutils.xml35
-rw-r--r--chapter05/dejagnu-inst.xml15
-rw-r--r--chapter05/dejagnu.xml16
-rw-r--r--chapter05/diffutils-inst.xml19
-rw-r--r--chapter05/diffutils.xml20
-rw-r--r--chapter05/expect-inst.xml57
-rw-r--r--chapter05/expect.xml58
-rw-r--r--chapter05/findutils-inst.xml24
-rw-r--r--chapter05/findutils.xml26
-rw-r--r--chapter05/gawk-inst.xml25
-rw-r--r--chapter05/gawk.xml26
-rw-r--r--chapter05/gcc-pass1-inst.xml89
-rw-r--r--chapter05/gcc-pass1.xml90
-rw-r--r--chapter05/gcc-pass2-inst.xml164
-rw-r--r--chapter05/gcc-pass2.xml165
-rw-r--r--chapter05/gettext-inst.xml29
-rw-r--r--chapter05/gettext.xml31
-rw-r--r--chapter05/glibc-inst.xml169
-rw-r--r--chapter05/glibc.xml170
-rw-r--r--chapter05/grep-inst.xml38
-rw-r--r--chapter05/grep.xml39
-rw-r--r--chapter05/gzip-inst.xml19
-rw-r--r--chapter05/gzip.xml20
-rw-r--r--chapter05/kernelheaders-inst.xml46
-rw-r--r--chapter05/kernelheaders.xml47
-rw-r--r--chapter05/make-inst.xml25
-rw-r--r--chapter05/make.xml26
-rw-r--r--chapter05/ncurses-inst.xml43
-rw-r--r--chapter05/ncurses.xml44
-rw-r--r--chapter05/patch-inst.xml22
-rw-r--r--chapter05/patch.xml23
-rw-r--r--chapter05/perl-inst.xml29
-rw-r--r--chapter05/perl.xml30
-rw-r--r--chapter05/sed-inst.xml25
-rw-r--r--chapter05/sed.xml26
-rw-r--r--chapter05/tar-inst.xml25
-rw-r--r--chapter05/tar.xml26
-rw-r--r--chapter05/tcl-inst.xml57
-rw-r--r--chapter05/tcl.xml58
-rw-r--r--chapter05/texinfo-inst.xml25
-rw-r--r--chapter05/texinfo.xml26
-rw-r--r--chapter05/utillinux-inst.xml31
-rw-r--r--chapter05/utillinux.xml33
-rw-r--r--chapter06/autoconf-inst.xml24
-rw-r--r--chapter06/autoconf.xml26
-rw-r--r--chapter06/automake-inst.xml28
-rw-r--r--chapter06/automake.xml31
-rw-r--r--chapter06/bash-inst.xml34
-rw-r--r--chapter06/bash.xml37
-rw-r--r--chapter06/binutils-inst.xml72
-rw-r--r--chapter06/binutils.xml74
-rw-r--r--chapter06/bison-inst.xml30
-rw-r--r--chapter06/bison.xml31
-rw-r--r--chapter06/bootscripts-inst.xml25
-rw-r--r--chapter06/bootscripts.xml26
-rw-r--r--chapter06/bzip2-inst.xml37
-rw-r--r--chapter06/bzip2.xml40
-rw-r--r--chapter06/coreutils-inst.xml78
-rw-r--r--chapter06/coreutils.xml79
-rw-r--r--chapter06/diffutils-inst.xml19
-rw-r--r--chapter06/diffutils.xml21
-rw-r--r--chapter06/e2fsprogs-inst.xml55
-rw-r--r--chapter06/e2fsprogs.xml57
-rw-r--r--chapter06/ed-inst.xml47
-rw-r--r--chapter06/ed.xml49
-rw-r--r--chapter06/file-inst.xml19
-rw-r--r--chapter06/file.xml20
-rw-r--r--chapter06/findutils-inst.xml30
-rw-r--r--chapter06/findutils.xml32
-rw-r--r--chapter06/flex-inst.xml45
-rw-r--r--chapter06/flex.xml47
-rw-r--r--chapter06/gawk-inst.xml51
-rw-r--r--chapter06/gawk.xml52
-rw-r--r--chapter06/gcc-2953-inst.xml51
-rw-r--r--chapter06/gcc-2953.xml52
-rw-r--r--chapter06/gcc-inst.xml78
-rw-r--r--chapter06/gcc.xml80
-rw-r--r--chapter06/gettext-inst.xml25
-rw-r--r--chapter06/gettext.xml27
-rw-r--r--chapter06/glibc-inst.xml110
-rw-r--r--chapter06/glibc.xml112
-rw-r--r--chapter06/grep-inst.xml26
-rw-r--r--chapter06/grep.xml28
-rw-r--r--chapter06/groff-inst.xml31
-rw-r--r--chapter06/groff.xml32
-rw-r--r--chapter06/grub-inst.xml41
-rw-r--r--chapter06/grub.xml43
-rw-r--r--chapter06/gzip-inst.xml34
-rw-r--r--chapter06/gzip.xml37
-rw-r--r--chapter06/inetutils-inst.xml51
-rw-r--r--chapter06/inetutils.xml53
-rw-r--r--chapter06/kbd-inst.xml25
-rw-r--r--chapter06/kbd.xml26
-rw-r--r--chapter06/kernel-inst.xml61
-rw-r--r--chapter06/kernel.xml63
-rw-r--r--chapter06/less-inst.xml27
-rw-r--r--chapter06/less.xml28
-rw-r--r--chapter06/lfs-utils-inst.xml24
-rw-r--r--chapter06/lfs-utils.xml26
-rw-r--r--chapter06/libtool-inst.xml24
-rw-r--r--chapter06/libtool.xml27
-rw-r--r--chapter06/m4-inst.xml25
-rw-r--r--chapter06/m4.xml26
-rw-r--r--chapter06/make-inst.xml25
-rw-r--r--chapter06/make.xml27
-rw-r--r--chapter06/makedev-inst.xml59
-rw-r--r--chapter06/makedev.xml60
-rw-r--r--chapter06/man-inst.xml62
-rw-r--r--chapter06/man.xml63
-rw-r--r--chapter06/manpages-inst.xml11
-rw-r--r--chapter06/manpages.xml13
-rw-r--r--chapter06/modutils-inst.xml19
-rw-r--r--chapter06/modutils.xml21
-rw-r--r--chapter06/ncurses-inst.xml48
-rw-r--r--chapter06/ncurses.xml49
-rw-r--r--chapter06/nettools-inst.xml38
-rw-r--r--chapter06/nettools.xml39
-rw-r--r--chapter06/patch-inst.xml22
-rw-r--r--chapter06/patch.xml23
-rw-r--r--chapter06/perl-inst.xml36
-rw-r--r--chapter06/perl.xml37
-rw-r--r--chapter06/procinfo-inst.xml22
-rw-r--r--chapter06/procinfo.xml24
-rw-r--r--chapter06/procps-inst.xml24
-rw-r--r--chapter06/procps.xml26
-rw-r--r--chapter06/psmisc-inst.xml37
-rw-r--r--chapter06/psmisc.xml39
-rw-r--r--chapter06/sed-inst.xml25
-rw-r--r--chapter06/sed.xml27
-rw-r--r--chapter06/shadowpwd-inst.xml105
-rw-r--r--chapter06/shadowpwd.xml108
-rw-r--r--chapter06/sysklogd-inst.xml15
-rw-r--r--chapter06/sysklogd.xml18
-rw-r--r--chapter06/sysvinit-inst.xml29
-rw-r--r--chapter06/sysvinit.xml32
-rw-r--r--chapter06/tar-inst.xml26
-rw-r--r--chapter06/tar.xml28
-rw-r--r--chapter06/texinfo-inst.xml37
-rw-r--r--chapter06/texinfo.xml39
-rw-r--r--chapter06/utillinux-inst.xml43
-rw-r--r--chapter06/utillinux.xml45
-rw-r--r--chapter06/vim-inst.xml37
-rw-r--r--chapter06/vim.xml40
-rw-r--r--chapter06/zlib-inst.xml64
-rw-r--r--chapter06/zlib.xml66
-rw-r--r--entities/autoconf.ent1
-rw-r--r--entities/automake.ent1
-rw-r--r--entities/bash.ent2
-rw-r--r--entities/binutils.ent3
-rw-r--r--entities/bison.ent1
-rw-r--r--entities/bootscripts.ent1
-rw-r--r--entities/bzip2.ent2
-rw-r--r--entities/coreutils.ent2
-rw-r--r--entities/dejagnu.ent1
-rw-r--r--entities/diffutils.ent2
-rw-r--r--entities/e2fsprogs.ent1
-rw-r--r--entities/ed.ent1
-rw-r--r--entities/expect.ent1
-rw-r--r--entities/file.ent1
-rw-r--r--entities/findutils.ent2
-rw-r--r--entities/flex.ent1
-rw-r--r--entities/gawk.ent2
-rw-r--r--entities/gcc-2953.ent1
-rw-r--r--entities/gcc.ent3
-rw-r--r--entities/gettext.ent2
-rw-r--r--entities/glibc.ent2
-rw-r--r--entities/grep.ent2
-rw-r--r--entities/groff.ent1
-rw-r--r--entities/grub.ent1
-rw-r--r--entities/gzip.ent2
-rw-r--r--entities/inetutils.ent1
-rw-r--r--entities/kbd.ent1
-rw-r--r--entities/less.ent1
-rw-r--r--entities/lfs-utils.ent1
-rw-r--r--entities/libtool.ent1
-rw-r--r--entities/m4.ent1
-rw-r--r--entities/make.ent2
-rw-r--r--entities/makedev.ent1
-rw-r--r--entities/man.ent1
-rw-r--r--entities/manpages.ent1
-rw-r--r--entities/modutils.ent1
-rw-r--r--entities/ncurses.ent2
-rw-r--r--entities/nettools.ent1
-rw-r--r--entities/patch.ent2
-rw-r--r--entities/perl.ent2
-rw-r--r--entities/procinfo.ent1
-rw-r--r--entities/procps.ent1
-rw-r--r--entities/psmisc.ent1
-rw-r--r--entities/sed.ent2
-rw-r--r--entities/shadow.ent1
-rw-r--r--entities/sysklogd.ent1
-rw-r--r--entities/sysvinit.ent1
-rw-r--r--entities/tar.ent2
-rw-r--r--entities/tcl.ent1
-rw-r--r--entities/texinfo.ent2
-rw-r--r--entities/utillinux.ent2
-rw-r--r--entities/vim.ent1
-rw-r--r--entities/zlib.ent1
207 files changed, 3282 insertions, 3401 deletions
diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml
deleted file mode 100644
index 0a3a96933..000000000
--- a/chapter05/bash-inst.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Bash</title>
-
-<para>Bash contains several known bugs. Fix these with the following
-patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&bash-patch;</userinput></screen>
-
-<para>Now prepare Bash for compilation:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the program:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make tests</userinput></screen>
-
-<para>Then install it and its documentation:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And make a link for the programs that use <userinput>sh</userinput>
-for a shell:</para>
-
-<screen><userinput>ln -s bash /tools/bin/sh</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 8ea856ad1..16824d4dd 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -7,7 +7,41 @@ Estimated required disk space: &bash-compsize-tools;</screen>
&aa-bash-shortdesc;
&aa-bash-dep;
-&c5-bash-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Bash</title>
+
+<para>Bash contains several known bugs. Fix these with the following
+patch:</para>
+
+<screen><userinput>patch -Np1 -i ../&bash-patch;</userinput></screen>
+
+<para>Now prepare Bash for compilation:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the program:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make tests</userinput></screen>
+
+<para>Then install it and its documentation:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And make a link for the programs that use <userinput>sh</userinput>
+for a shell:</para>
+
+<screen><userinput>ln -s bash /tools/bin/sh</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/binutils-pass1-inst.xml b/chapter05/binutils-pass1-inst.xml
deleted file mode 100644
index 15465730b..000000000
--- a/chapter05/binutils-pass1-inst.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Binutils</title>
-
-<para>It is important that Binutils be the first package to get compiled,
-because both Glibc and GCC perform various tests on the available linker and
-assembler to determine which of their own features to enable.</para>
-
-<note><para>Even though Binutils is an important toolchain package, we are not
-going to run the test suite at this early stage. First, the test suite framework
-is not yet in place and second, the programs from this first pass will soon be
-overwritten by those installed in the second pass.</para></note>
-
-<para>This package is known to behave badly when you have changed its default
-optimization flags (including the -march and -mcpu options). Therefore, if
-you have defined any environment variables that override default
-optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting or
-modifying them when building Binutils.</para>
-
-<para>The Binutils documentation recommends building Binutils outside of the
-source directory in a dedicated build directory:</para>
-
-<screen><userinput>mkdir ../binutils-build
-cd ../binutils-build</userinput></screen>
-
-<note><para>If you want the SBU values listed in the rest of the book to be of
-any use, you will have to measure the time it takes to build this package. To
-achieve this easily, you could do something like:
-<userinput>time { ./configure ... &amp;&amp; ... &amp;&amp; ... &amp;&amp; make install; }</userinput>.</para></note>
-
-<para>Now prepare Binutils for compilation:</para>
-
-<screen><userinput>../binutils-&binutils-version;/configure \
-&nbsp;&nbsp;&nbsp;&nbsp;--prefix=/tools --disable-nls</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--prefix=/tools</userinput>: This tells the
-configure script to prepare to install the Binutils programs in the
-<filename>/tools</filename> directory.</para></listitem>
-
-<listitem><para><userinput>--disable-nls</userinput>: This disables
-internationalization (a word often shortened to i18n). We don't need this
-for our static programs and <emphasis>nls</emphasis> often causes problems
-when linking statically.</para></listitem>
-</itemizedlist>
-
-<para>Continue with compiling the package:</para>
-
-<screen><userinput>make configure-host
-make LDFLAGS="-all-static"</userinput></screen>
-
-<para>The meaning of the make options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>configure-host</userinput>: This forces all the
-subdirectories to be configured immediately. A statically linked build will
-fail without it. We therefore use this option to work around the
-problem.</para></listitem>
-
-<listitem><para><userinput>LDFLAGS="-all-static"</userinput>: This tells the
-linker that all the Binutils programs should be linked statically. However,
-strictly speaking, <userinput>"-all-static"</userinput> is first passed to the
-<emphasis>libtool</emphasis> program which then passes
-<userinput>"-static"</userinput> on to the linker.</para></listitem>
-</itemizedlist>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Now prepare the linker for the "locking in" of Glibc later on:</para>
-
-<screen><userinput>make -C ld clean
-make -C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib</userinput></screen>
-
-<para>The meaning of the make options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>-C ld clean</userinput>: This tells the make program
-to remove all the compiled files, but only in the <filename>ld</filename>
-subdirectory.</para></listitem>
-
-<listitem><para><userinput>-C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib</userinput>:
-This option rebuilds everything in the <filename>ld</filename> subdirectory.
-Specifying the LIB_PATH makefile variable on the command line allows us to
-override the default value and have it point to our temporary tools location.
-The value of this variable specifies the linker's default library search path.
-You'll see how this preparation is used later on in the
-chapter.</para></listitem>
-</itemizedlist>
-
-<!-- HACK - Force some whitespace to appease tidy -->
-<literallayout></literallayout>
-
-<warning><para>Do not yet remove the Binutils build and source directories. You
-will need them again in their current state a bit further on in this
-chapter.</para></warning>
-
-<!-- HACK - Force some whitespace to appease tidy -->
-<literallayout></literallayout>
-
-</sect2>
-
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 5f533f1dd..6c7e62d98 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -7,7 +7,112 @@ Estimated required disk space: &binutils-compsize-tools-pass1;</screen>
&aa-binutils-shortdesc;
&aa-binutils-dep;
-&c5-binutils-pass1-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Binutils</title>
+
+<para>It is important that Binutils be the first package to get compiled,
+because both Glibc and GCC perform various tests on the available linker and
+assembler to determine which of their own features to enable.</para>
+
+<note><para>Even though Binutils is an important toolchain package, we are not
+going to run the test suite at this early stage. First, the test suite framework
+is not yet in place and second, the programs from this first pass will soon be
+overwritten by those installed in the second pass.</para></note>
+
+<para>This package is known to behave badly when you have changed its default
+optimization flags (including the -march and -mcpu options). Therefore, if
+you have defined any environment variables that override default
+optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting or
+modifying them when building Binutils.</para>
+
+<para>The Binutils documentation recommends building Binutils outside of the
+source directory in a dedicated build directory:</para>
+
+<screen><userinput>mkdir ../binutils-build
+cd ../binutils-build</userinput></screen>
+
+<note><para>If you want the SBU values listed in the rest of the book to be of
+any use, you will have to measure the time it takes to build this package. To
+achieve this easily, you could do something like:
+<userinput>time { ./configure ... &amp;&amp; ... &amp;&amp; ... &amp;&amp; make install; }</userinput>.</para></note>
+
+<para>Now prepare Binutils for compilation:</para>
+
+<screen><userinput>../binutils-&binutils-version;/configure \
+&nbsp;&nbsp;&nbsp;&nbsp;--prefix=/tools --disable-nls</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--prefix=/tools</userinput>: This tells the
+configure script to prepare to install the Binutils programs in the
+<filename>/tools</filename> directory.</para></listitem>
+
+<listitem><para><userinput>--disable-nls</userinput>: This disables
+internationalization (a word often shortened to i18n). We don't need this
+for our static programs and <emphasis>nls</emphasis> often causes problems
+when linking statically.</para></listitem>
+</itemizedlist>
+
+<para>Continue with compiling the package:</para>
+
+<screen><userinput>make configure-host
+make LDFLAGS="-all-static"</userinput></screen>
+
+<para>The meaning of the make options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>configure-host</userinput>: This forces all the
+subdirectories to be configured immediately. A statically linked build will
+fail without it. We therefore use this option to work around the
+problem.</para></listitem>
+
+<listitem><para><userinput>LDFLAGS="-all-static"</userinput>: This tells the
+linker that all the Binutils programs should be linked statically. However,
+strictly speaking, <userinput>"-all-static"</userinput> is first passed to the
+<emphasis>libtool</emphasis> program which then passes
+<userinput>"-static"</userinput> on to the linker.</para></listitem>
+</itemizedlist>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Now prepare the linker for the "locking in" of Glibc later on:</para>
+
+<screen><userinput>make -C ld clean
+make -C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib</userinput></screen>
+
+<para>The meaning of the make options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>-C ld clean</userinput>: This tells the make program
+to remove all the compiled files, but only in the <filename>ld</filename>
+subdirectory.</para></listitem>
+
+<listitem><para><userinput>-C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib</userinput>:
+This option rebuilds everything in the <filename>ld</filename> subdirectory.
+Specifying the LIB_PATH makefile variable on the command line allows us to
+override the default value and have it point to our temporary tools location.
+The value of this variable specifies the linker's default library search path.
+You'll see how this preparation is used later on in the
+chapter.</para></listitem>
+</itemizedlist>
+
+<!-- HACK - Force some whitespace to appease tidy -->
+<literallayout></literallayout>
+
+<warning><para>Do not yet remove the Binutils build and source directories. You
+will need them again in their current state a bit further on in this
+chapter.</para></warning>
+
+<!-- HACK - Force some whitespace to appease tidy -->
+<literallayout></literallayout>
+
+</sect2>
</sect1>
diff --git a/chapter05/binutils-pass2-inst.xml b/chapter05/binutils-pass2-inst.xml
deleted file mode 100644
index 55d61844e..000000000
--- a/chapter05/binutils-pass2-inst.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Re-installation of Binutils</title>
-
-<para>Create a separate build directory again:</para>
-
-<screen><userinput>mkdir ../binutils-build
-cd ../binutils-build</userinput></screen>
-
-<para>Now prepare Binutils to be compiled:</para>
-
-<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --with-lib-path=/tools/lib</userinput></screen>
-
-<para>The meaning of the new configure option:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--with-lib-path=/tools/lib</userinput>: This tells
-the configure script to specify the default library search path. We don't want
-the library search path to contain library directories from the host
-system.</para></listitem>
-</itemizedlist>
-
-<para>Before starting to build Binutils, remember to unset any environment
-variables that override the default optimization flags.</para>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make </userinput></screen>
-
-<note><para>It's worth pointing out that running the Binutils test suite here
-is considered not as important as running it in
-<xref linkend="chapter06"/>.</para></note>
-
-<para>Test the results (there should be no unexpected failures here, expected
-failures are fine):</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Unfortunately, there is no easy way to view the test results summary like
-there was for the previous GCC package. However, if a failure occurs here, it
-should be easy to spot. The output shown will contain something like:</para>
-
-<blockquote><screen>make[1]: *** [check-binutils] Error 2</screen></blockquote>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Now prepare Binutils for the re-adjusting of the toolchain in the next
-chapter:</para>
-
-<screen><userinput>make -C ld clean
-make -C ld LIB_PATH=/usr/lib:/lib</userinput></screen>
-
-<!-- HACK - Force some whitespace to appease tidy -->
-<literallayout></literallayout>
-
-<warning><para>Do not yet remove the Binutils source and build directories.
-We'll need these directories again in the next chapter in the state they are in
-now.</para></warning>
-
-<!-- HACK - Force some whitespace to appease tidy -->
-<literallayout></literallayout>
-
-</sect2>
-
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 3e9827b5f..adcd0c16b 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -5,7 +5,74 @@
<screen>Estimated build time: &binutils-time-tools-pass2;
Estimated required disk space: &binutils-compsize-tools-pass2;</screen>
-&c5-binutils-pass2-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Re-installation of Binutils</title>
+
+<para>Create a separate build directory again:</para>
+
+<screen><userinput>mkdir ../binutils-build
+cd ../binutils-build</userinput></screen>
+
+<para>Now prepare Binutils to be compiled:</para>
+
+<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --with-lib-path=/tools/lib</userinput></screen>
+
+<para>The meaning of the new configure option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--with-lib-path=/tools/lib</userinput>: This tells
+the configure script to specify the default library search path. We don't want
+the library search path to contain library directories from the host
+system.</para></listitem>
+</itemizedlist>
+
+<para>Before starting to build Binutils, remember to unset any environment
+variables that override the default optimization flags.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<note><para>It's worth pointing out that running the Binutils test suite here
+is considered not as important as running it in
+<xref linkend="chapter06"/>.</para></note>
+
+<para>Test the results (there should be no unexpected failures here, expected
+failures are fine):</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Unfortunately, there is no easy way to view the test results summary like
+there was for the previous GCC package. However, if a failure occurs here, it
+should be easy to spot. The output shown will contain something like:</para>
+
+<blockquote><screen>make[1]: *** [check-binutils] Error 2</screen></blockquote>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Now prepare Binutils for the re-adjusting of the toolchain in the next
+chapter:</para>
+
+<screen><userinput>make -C ld clean
+make -C ld LIB_PATH=/usr/lib:/lib</userinput></screen>
+
+<!-- HACK - Force some whitespace to appease tidy -->
+<literallayout></literallayout>
+
+<warning><para>Do not yet remove the Binutils source and build directories.
+We'll need these directories again in the next chapter in the state they are in
+now.</para></warning>
+
+<!-- HACK - Force some whitespace to appease tidy -->
+<literallayout></literallayout>
+
+</sect2>
</sect1>
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml
deleted file mode 100644
index 0cce861b1..000000000
--- a/chapter05/bzip2-inst.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Bzip2</title>
-
-<para>The Bzip2 package doesn't contain a <userinput>configure</userinput>
-script. Compile and install it with a straightforward:</para>
-
-<screen><userinput>make PREFIX=/tools install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index 9207f646d..be20eae98 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -7,7 +7,18 @@ Estimated required disk space: &bzip2-compsize-tools;</screen>
&aa-bzip2-shortdesc;
&aa-bzip2-dep;
-&c5-bzip2-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Bzip2</title>
+
+<para>The Bzip2 package doesn't contain a <userinput>configure</userinput>
+script. Compile and install it with a straightforward:</para>
+
+<screen><userinput>make PREFIX=/tools install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/coreutils-inst.xml b/chapter05/coreutils-inst.xml
deleted file mode 100644
index 4d58b1cc4..000000000
--- a/chapter05/coreutils-inst.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Coreutils</title>
-
-<para>Prepare Coreutils to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput></screen>
-
-<para>The meaning of the make option:</para>
-
-<itemizedlist>
-<listitem><para><userinput>RUN_EXPENSIVE_TESTS=yes</userinput>: This tells the
-test suite to run several additional tests that are considered relatively
-expensive on some platforms. However, they are generally not a problem on
-Linux.</para></listitem>
-</itemizedlist>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 17b3d3432..e37456266 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -7,7 +7,40 @@ Estimated required disk space: &coreutils-compsize-tools;</screen>
&aa-coreutils-shortdesc;
&aa-coreutils-dep;
-&c5-coreutils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Coreutils</title>
+
+<para>Prepare Coreutils to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput></screen>
+
+<para>The meaning of the make option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>RUN_EXPENSIVE_TESTS=yes</userinput>: This tells the
+test suite to run several additional tests that are considered relatively
+expensive on some platforms. However, they are generally not a problem on
+Linux.</para></listitem>
+</itemizedlist>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/dejagnu-inst.xml b/chapter05/dejagnu-inst.xml
deleted file mode 100644
index 6f6256b8c..000000000
--- a/chapter05/dejagnu-inst.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of DejaGnu</title>
-
-<para>Prepare DejaGnu to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Build and install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index 318eb1506..73218be46 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -7,7 +7,21 @@ Estimated required disk space: &dejagnu-compsize-tools;</screen>
&aa-dejagnu-shortdesc;
&aa-dejagnu-dep;
-&c5-dejagnu-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of DejaGnu</title>
+
+<para>Prepare DejaGnu to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Build and install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
deleted file mode 100644
index 4f8048c13..000000000
--- a/chapter05/diffutils-inst.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Diffutils</title>
-
-<para>Prepare Diffutils to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 75ef875e3..cbb39c53b 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -7,7 +7,25 @@ Estimated required disk space: &diffutils-compsize-tools;</screen>
&aa-diffutils-shortdesc;
&aa-diffutils-dep;
-&c5-diffutils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Diffutils</title>
+
+<para>Prepare Diffutils to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/expect-inst.xml b/chapter05/expect-inst.xml
deleted file mode 100644
index 2f6387ef9..000000000
--- a/chapter05/expect-inst.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Expect</title>
-
-<para>First apply a patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&expect-patch;</userinput></screen>
-
-<para>This fixes a bug in Expect that can result in bogus failures during the
-GCC test suite run.</para>
-
-<para>Now prepare Expect to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib --with-x=no</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--with-tcl=/tools/lib</userinput>: This ensures that
-the configure script finds the Tcl installation in our temporary tools location.
-We don't want it to find an existing one that may possibly reside on the host
-system.</para></listitem>
-
-<listitem><para><userinput>--with-x=no</userinput>: This tells the configure
-script not to search for Tk (the Tcl GUI component) or the X Window System
-libraries, both of which may possibly reside on the host system.</para></listitem>
-</itemizedlist>
-
-<para>Build the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. However, the Expect test suite here in
-Chapter 5 is known to experience failures under certain host conditions that
-are not fully understood. Therefore, test suite failures here are not
-surprising, but are not considered critical. Should you choose to run the test
-suite, the following command will do so:</para>
-
-<screen><userinput>make test</userinput></screen>
-
-<para>And install:</para>
-
-<screen><userinput>make SCRIPTS="" install</userinput></screen>
-
-<para>The meaning of the make option:</para>
-
-<itemizedlist>
-<listitem><para><userinput>SCRIPTS=""</userinput>: This prevents installation of
-the supplementary expect scripts which are not needed.</para></listitem>
-</itemizedlist>
-
-<para>You can now remove the source directories of both Tcl and Expect.</para>
-
-</sect2>
-
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 338d35537..500cfb5b9 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -7,7 +7,63 @@ Estimated required disk space: &expect-compsize-tools;</screen>
&aa-expect-shortdesc;
&aa-expect-dep;
-&c5-expect-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Expect</title>
+
+<para>First apply a patch:</para>
+
+<screen><userinput>patch -Np1 -i ../&expect-patch;</userinput></screen>
+
+<para>This fixes a bug in Expect that can result in bogus failures during the
+GCC test suite run.</para>
+
+<para>Now prepare Expect to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib --with-x=no</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--with-tcl=/tools/lib</userinput>: This ensures that
+the configure script finds the Tcl installation in our temporary tools location.
+We don't want it to find an existing one that may possibly reside on the host
+system.</para></listitem>
+
+<listitem><para><userinput>--with-x=no</userinput>: This tells the configure
+script not to search for Tk (the Tcl GUI component) or the X Window System
+libraries, both of which may possibly reside on the host system.</para></listitem>
+</itemizedlist>
+
+<para>Build the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. However, the Expect test suite here in
+Chapter 5 is known to experience failures under certain host conditions that
+are not fully understood. Therefore, test suite failures here are not
+surprising, but are not considered critical. Should you choose to run the test
+suite, the following command will do so:</para>
+
+<screen><userinput>make test</userinput></screen>
+
+<para>And install:</para>
+
+<screen><userinput>make SCRIPTS="" install</userinput></screen>
+
+<para>The meaning of the make option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>SCRIPTS=""</userinput>: This prevents installation of
+the supplementary expect scripts which are not needed.</para></listitem>
+</itemizedlist>
+
+<para>You can now remove the source directories of both Tcl and Expect.</para>
+
+</sect2>
</sect1>
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
deleted file mode 100644
index 45656baf5..000000000
--- a/chapter05/findutils-inst.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installing Findutils</title>
-
-<para>Prepare Findutils to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make </userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index 04560c80d..00021490b 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -7,7 +7,31 @@ Estimated required disk space: &findutils-compsize-tools;</screen>
&aa-findutils-shortdesc;
&aa-findutils-dep;
-&c5-findutils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installing Findutils</title>
+
+<para>Prepare Findutils to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
deleted file mode 100644
index 43e394804..000000000
--- a/chapter05/gawk-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Gawk</title>
-
-<para>Prepare Gawk to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index 37b042779..1bb48f384 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -7,7 +7,31 @@ Estimated required disk space: &gawk-compsize-tools;</screen>
&aa-gawk-shortdesc;
&aa-gawk-dep;
-&c5-gawk-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Gawk</title>
+
+<para>Prepare Gawk to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/gcc-pass1-inst.xml b/chapter05/gcc-pass1-inst.xml
deleted file mode 100644
index d396405ab..000000000
--- a/chapter05/gcc-pass1-inst.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of GCC</title>
-
-<para>Unpack only the GCC-core tarball, as we won't be needing a C++ compiler
-for the moment.</para>
-
-<note><para>Even though GCC is an important toolchain package, we are not
-going to run the test suite at this early stage. First, the test suite framework
-is not yet in place and second, the programs from this first pass will soon be
-overwritten by those installed in the second pass.</para></note>
-
-<para>This package is known to behave badly when you have changed its
-default optimization flags (including the -march and -mcpu options).
-Therefore, if you have defined any environment variables that override
-default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
-or modifying them when building GCC.</para>
-
-<para>The GCC documentation recommends building GCC outside of the source
-directory in a dedicated build directory:</para>
-
-<screen><userinput>mkdir ../gcc-build
-cd ../gcc-build</userinput></screen>
-
-<para>Prepare GCC to be compiled:</para>
-
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-local-prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls --enable-shared \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--with-local-prefix=/tools</userinput>: The
-purpose of this switch is to remove <filename>/usr/local/include</filename>
-from <userinput>gcc</userinput>'s include search path. This is not absolutely
-essential; however, we want to try to minimize the influence of the host
-system, thus making this a sensible thing to do.</para></listitem>
-
-<listitem><para><userinput>--enable-shared</userinput>: This switch may
-seem counter-intuitive at first. But using it allows the building of
-<filename>libgcc_s.so.1</filename> and <filename>libgcc_eh.a</filename>, and
-having <filename>libgcc_eh.a</filename> available ensures that the configure
-script for Glibc (the next package we compile) produces the proper results.
-Note that the <userinput>gcc</userinput> binaries will still be linked
-statically, as this is controlled by the <userinput>-static</userinput>
-value of BOOT_LDFLAGS further on.</para></listitem>
-
-<listitem><para><userinput>--enable-languages=c</userinput>: This option
-ensures that only the C compiler is built. The option is only needed when you
-have downloaded and unpacked the full GCC tarball.</para></listitem>
-</itemizedlist>
-
-<para>Continue with compiling the package:</para>
-
-<screen><userinput>make BOOT_LDFLAGS="-static" bootstrap</userinput></screen>
-
-<para>The meaning of the make parameters:</para>
-
-<itemizedlist>
-<listitem><para><userinput>BOOT_LDFLAGS="-static"</userinput>: This tells
-GCC to link its programs statically.</para></listitem>
-
-<listitem><para><userinput>bootstrap</userinput>: This target doesn't just
-compile GCC, but compiles it several times. It uses the programs compiled in
-a first round to compile itself a second time, and then again a third time.
-It then compares these second and third compiles to make sure it can
-reproduce itself flawlessly, which most probably means that it was
-compiled correctly.</para></listitem>
-</itemizedlist>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>As a finishing touch we'll create the <filename
-class="symlink">/tools/bin/cc</filename> symlink. Many programs and
-scripts run <userinput>cc</userinput> instead of <userinput>gcc</userinput>,
-a thing meant to keep programs generic and therefore usable on all kinds of
-Unix systems. Not everybody has the GNU C compiler installed. Simply running
-<userinput>cc</userinput> leaves the system administrator free to decide what
-C compiler to install, as long as there's a symlink pointing to it:</para>
-
-<screen><userinput>ln -sf gcc /tools/bin/cc</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 42325708f..58cfb6c56 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -7,7 +7,95 @@ Estimated required disk space: &gcc-compsize-tools-pass1;</screen>
&aa-gcc-shortdesc;
&aa-gcc-dep;
-&c5-gcc-pass1-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of GCC</title>
+
+<para>Unpack only the GCC-core tarball, as we won't be needing a C++ compiler
+for the moment.</para>
+
+<note><para>Even though GCC is an important toolchain package, we are not
+going to run the test suite at this early stage. First, the test suite framework
+is not yet in place and second, the programs from this first pass will soon be
+overwritten by those installed in the second pass.</para></note>
+
+<para>This package is known to behave badly when you have changed its
+default optimization flags (including the -march and -mcpu options).
+Therefore, if you have defined any environment variables that override
+default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
+or modifying them when building GCC.</para>
+
+<para>The GCC documentation recommends building GCC outside of the source
+directory in a dedicated build directory:</para>
+
+<screen><userinput>mkdir ../gcc-build
+cd ../gcc-build</userinput></screen>
+
+<para>Prepare GCC to be compiled:</para>
+
+<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
+&nbsp;&nbsp;&nbsp;&nbsp;--with-local-prefix=/tools \
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls --enable-shared \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--with-local-prefix=/tools</userinput>: The
+purpose of this switch is to remove <filename>/usr/local/include</filename>
+from <userinput>gcc</userinput>'s include search path. This is not absolutely
+essential; however, we want to try to minimize the influence of the host
+system, thus making this a sensible thing to do.</para></listitem>
+
+<listitem><para><userinput>--enable-shared</userinput>: This switch may
+seem counter-intuitive at first. But using it allows the building of
+<filename>libgcc_s.so.1</filename> and <filename>libgcc_eh.a</filename>, and
+having <filename>libgcc_eh.a</filename> available ensures that the configure
+script for Glibc (the next package we compile) produces the proper results.
+Note that the <userinput>gcc</userinput> binaries will still be linked
+statically, as this is controlled by the <userinput>-static</userinput>
+value of BOOT_LDFLAGS further on.</para></listitem>
+
+<listitem><para><userinput>--enable-languages=c</userinput>: This option
+ensures that only the C compiler is built. The option is only needed when you
+have downloaded and unpacked the full GCC tarball.</para></listitem>
+</itemizedlist>
+
+<para>Continue with compiling the package:</para>
+
+<screen><userinput>make BOOT_LDFLAGS="-static" bootstrap</userinput></screen>
+
+<para>The meaning of the make parameters:</para>
+
+<itemizedlist>
+<listitem><para><userinput>BOOT_LDFLAGS="-static"</userinput>: This tells
+GCC to link its programs statically.</para></listitem>
+
+<listitem><para><userinput>bootstrap</userinput>: This target doesn't just
+compile GCC, but compiles it several times. It uses the programs compiled in
+a first round to compile itself a second time, and then again a third time.
+It then compares these second and third compiles to make sure it can
+reproduce itself flawlessly, which most probably means that it was
+compiled correctly.</para></listitem>
+</itemizedlist>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>As a finishing touch we'll create the <filename
+class="symlink">/tools/bin/cc</filename> symlink. Many programs and
+scripts run <userinput>cc</userinput> instead of <userinput>gcc</userinput>,
+a thing meant to keep programs generic and therefore usable on all kinds of
+Unix systems. Not everybody has the GNU C compiler installed. Simply running
+<userinput>cc</userinput> leaves the system administrator free to decide what
+C compiler to install, as long as there's a symlink pointing to it:</para>
+
+<screen><userinput>ln -sf gcc /tools/bin/cc</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml
deleted file mode 100644
index a5256c9ed..000000000
--- a/chapter05/gcc-pass2-inst.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Re-installation of GCC</title>
-
-<para>The tools required to test GCC and Binutils are installed now (Tcl, Expect
-and DejaGnu). We can continue on rebuilding GCC and Binutils, link them against
-the new Glibc, and test them properly. One thing to note, however, is that these
-test suites are highly dependent on properly functioning pseudo terminals (PTYs)
-which are provided by your host distribution. These days, PTYs are most commonly
-implemented via the <emphasis>devpts</emphasis> file system. You can quickly
-check if your host system is set up correctly in this regard by performing a
-simple test:</para>
-
-<screen><userinput>expect -c "spawn ls"</userinput></screen>
-
-<para>If you receive the message:</para>
-
-<blockquote><screen>The system has no more ptys. Ask your system administrator to create more.</screen></blockquote>
-
-<para>Your host distribution is not set up for proper PTY operation. In this
-case there is no point in running the test suites for GCC and Binutils until you
-are able to resolve the issue. You can consult the LFS Wiki at
-<ulink url="http://wiki.linuxfromscratch.org/"/> for more information on how to
-get PTYs working.</para>
-
-<para>Unpack all three GCC tarballs (-core, -g++, and -testsuite) in one and the
-same working directory. They will all unfold into a single
-<filename>gcc-&gcc-version;/</filename> subdirectory.</para>
-
-<para>First correct one problem and make an essential adjustment:</para>
-
-<screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;
-patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
-
-<para>The first patch disables the GCC "fixincludes" script. We mentioned this
-briefly earlier, but a slightly more in-depth explanation of the fixincludes
-process is warranted here. Under normal circumstances, the GCC fixincludes
-script scans your system for header files that need to be fixed. It might find
-that some Glibc header files on your host system need to be fixed, fix them and
-put them in the GCC private include directory. Then, later on in
-<xref linkend="chapter06"/>, after we've installed the newer Glibc, this
-private include directory would be searched before the system include
-directory, resulting in GCC finding the fixed headers from the host system,
-which would most likely not match the Glibc version actually used for the LFS
-system.</para>
-
-<para>The last patch changes GCC's default location of the dynamic linker
-(typically <filename>ld-linux.so.2</filename>). It also removes
-<filename class="directory">/usr/include</filename> from GCC's include search
-path. Patching now rather than adjusting the specs file after installation
-ensures that our new dynamic linker gets used during the actual build of GCC.
-That is, all the final (and temporary) binaries created during the build will
-link against the new Glibc.</para>
-
-<important><para>These patches are <emphasis>critical</emphasis> in ensuring a
-successful overall build. Do not forget to apply them.</para></important>
-
-<para>Create a separate build directory again:</para>
-
-<screen><userinput>mkdir ../gcc-build
-cd ../gcc-build</userinput></screen>
-
-<para>Before starting to build GCC, remember to unset any environment
-variables that override the default optimization flags.</para>
-
-<para>Now prepare GCC to be compiled:</para>
-
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-local-prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-clocale=gnu --enable-shared \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix --enable-__cxa_atexit \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++</userinput></screen>
-
-<para>The meaning of the new configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--enable-threads=posix</userinput>: This enables
-C++ exception handling for multi-threaded code.</para></listitem>
-
-<listitem><para><userinput>--enable-__cxa_atexit</userinput>: This option
-allows use of __cxa_atexit, rather than atexit, to register C++ destructors for
-local statics and global objects and is essential for fully standards-compliant
-handling of destructors. It also affects the C++ ABI and therefore results in
-C++ shared libraries and C++ programs that are interoperable with other Linux
-distributions.</para></listitem>
-
-<listitem><para><userinput>--enable-clocale=gnu</userinput>: This option ensures
-the correct locale model is selected for the C++ libraries under all
-circumstances. If the configure script finds the <emphasis>de_DE</emphasis>
-locale installed, it will select the correct model of <emphasis>gnu</emphasis>.
-However, people who don't install the <emphasis>de_DE</emphasis> locale, run the
-risk of building ABI incompatible C++ libraries due to the wrong locale model of
-<emphasis>generic</emphasis> being selected.</para></listitem>
-
-<listitem><para><userinput>--enable-languages=c,c++</userinput>: This option is
-needed to ensure that both C and C++ compilers are built.</para></listitem>
-</itemizedlist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>There is no need to use the <userinput>bootstrap</userinput> target now,
-as the compiler we're using to compile this GCC was built from the exact same
-version of the GCC sources we used earlier.</para>
-
-<note><para>It's worth pointing out that running the GCC test suite here
-is considered not as important as running it in
-<xref linkend="chapter06"/>.</para></note>
-
-<para>Test the results:</para>
-
-<screen><userinput>make -k check</userinput></screen>
-
-<para>The <userinput>-k</userinput> flag is used to make the test suite run
-through to completion and not stop at the first failure. The GCC test suite is
-very comprehensive and is almost guaranteed to generate a few failures. To get
-a summary of the test suite results, run this:</para>
-
-<screen><userinput>../gcc-&gcc-version;/contrib/test_summary | more</userinput></screen>
-
-<para>You can compare your results to those posted to the gcc-testresults
-mailing list for similar configurations to your own. For an example of how
-current GCC-&gcc-version; should look on i686-pc-linux-gnu, see
-<ulink url="http://gcc.gnu.org/ml/gcc-testresults/2003-08/msg01612.html"/>.</para>
-
-<para>Note that the results contain:</para>
-
-<screen>* 1 XPASS (unexpected pass) for g++
-* 1 FAIL (unexpected failure) for g++
-* 2 FAIL for gcc
-* 26 XPASS's for libstdc++</screen>
-
-<para>The unexpected pass for g++ is due to the use of
-<userinput>--enable-__cxa_atexit</userinput>. Apparently not all platforms
-supported by GCC have support for "__cxa_atexit" in their C libraries, so this
-test is not always expected to pass.</para>
-
-<para>The 26 unexpected passes for libstdc++ are due to the use of
-<userinput>--enable-clocale=gnu</userinput>, which is the correct choice on
-Glibc-based systems of versions 2.2.5 and above. The underlying locale support
-in the GNU C library is superior to that of the otherwise selected "generic"
-model (which may be applicable if for instance you were using Newlibc, Sun-libc
-or whatever libc). The libstdc++ test suite is apparently expecting the
-"generic" model, hence those tests are not always expected to pass.</para>
-
-<para>Unexpected failures often cannot be avoided. The GCC developers are
-usually aware of them but haven't yet gotten around to fixing them. In short,
-unless your results are vastly different from those at the above URL, it is safe
-to continue on.</para>
-
-<para>And finally install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<note><para>At this point it is strongly recommended to repeat the sanity check
-we performed earlier in the chapter. Refer back to
-<xref linkend="ch05-locking-glibc"/> and repeat the check. If the results are
-wrong, then most likely you forgot to apply the above mentioned GCC Specs
-patch.</para></note>
-
-</sect2>
-
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index ad9b1892d..0d4d638a7 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -5,7 +5,170 @@
<screen>Estimated build time: &gcc-time-tools-pass2;
Estimated required disk space: &gcc-compsize-tools-pass2;</screen>
-&c5-gcc-pass2-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Re-installation of GCC</title>
+
+<para>The tools required to test GCC and Binutils are installed now (Tcl, Expect
+and DejaGnu). We can continue on rebuilding GCC and Binutils, link them against
+the new Glibc, and test them properly. One thing to note, however, is that these
+test suites are highly dependent on properly functioning pseudo terminals (PTYs)
+which are provided by your host distribution. These days, PTYs are most commonly
+implemented via the <emphasis>devpts</emphasis> file system. You can quickly
+check if your host system is set up correctly in this regard by performing a
+simple test:</para>
+
+<screen><userinput>expect -c "spawn ls"</userinput></screen>
+
+<para>If you receive the message:</para>
+
+<blockquote><screen>The system has no more ptys. Ask your system administrator to create more.</screen></blockquote>
+
+<para>Your host distribution is not set up for proper PTY operation. In this
+case there is no point in running the test suites for GCC and Binutils until you
+are able to resolve the issue. You can consult the LFS Wiki at
+<ulink url="http://wiki.linuxfromscratch.org/"/> for more information on how to
+get PTYs working.</para>
+
+<para>Unpack all three GCC tarballs (-core, -g++, and -testsuite) in one and the
+same working directory. They will all unfold into a single
+<filename>gcc-&gcc-version;/</filename> subdirectory.</para>
+
+<para>First correct one problem and make an essential adjustment:</para>
+
+<screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;
+patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
+
+<para>The first patch disables the GCC "fixincludes" script. We mentioned this
+briefly earlier, but a slightly more in-depth explanation of the fixincludes
+process is warranted here. Under normal circumstances, the GCC fixincludes
+script scans your system for header files that need to be fixed. It might find
+that some Glibc header files on your host system need to be fixed, fix them and
+put them in the GCC private include directory. Then, later on in
+<xref linkend="chapter06"/>, after we've installed the newer Glibc, this
+private include directory would be searched before the system include
+directory, resulting in GCC finding the fixed headers from the host system,
+which would most likely not match the Glibc version actually used for the LFS
+system.</para>
+
+<para>The last patch changes GCC's default location of the dynamic linker
+(typically <filename>ld-linux.so.2</filename>). It also removes
+<filename class="directory">/usr/include</filename> from GCC's include search
+path. Patching now rather than adjusting the specs file after installation
+ensures that our new dynamic linker gets used during the actual build of GCC.
+That is, all the final (and temporary) binaries created during the build will
+link against the new Glibc.</para>
+
+<important><para>These patches are <emphasis>critical</emphasis> in ensuring a
+successful overall build. Do not forget to apply them.</para></important>
+
+<para>Create a separate build directory again:</para>
+
+<screen><userinput>mkdir ../gcc-build
+cd ../gcc-build</userinput></screen>
+
+<para>Before starting to build GCC, remember to unset any environment
+variables that override the default optimization flags.</para>
+
+<para>Now prepare GCC to be compiled:</para>
+
+<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
+&nbsp;&nbsp;&nbsp;&nbsp;--with-local-prefix=/tools \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-clocale=gnu --enable-shared \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix --enable-__cxa_atexit \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++</userinput></screen>
+
+<para>The meaning of the new configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--enable-threads=posix</userinput>: This enables
+C++ exception handling for multi-threaded code.</para></listitem>
+
+<listitem><para><userinput>--enable-__cxa_atexit</userinput>: This option
+allows use of __cxa_atexit, rather than atexit, to register C++ destructors for
+local statics and global objects and is essential for fully standards-compliant
+handling of destructors. It also affects the C++ ABI and therefore results in
+C++ shared libraries and C++ programs that are interoperable with other Linux
+distributions.</para></listitem>
+
+<listitem><para><userinput>--enable-clocale=gnu</userinput>: This option ensures
+the correct locale model is selected for the C++ libraries under all
+circumstances. If the configure script finds the <emphasis>de_DE</emphasis>
+locale installed, it will select the correct model of <emphasis>gnu</emphasis>.
+However, people who don't install the <emphasis>de_DE</emphasis> locale, run the
+risk of building ABI incompatible C++ libraries due to the wrong locale model of
+<emphasis>generic</emphasis> being selected.</para></listitem>
+
+<listitem><para><userinput>--enable-languages=c,c++</userinput>: This option is
+needed to ensure that both C and C++ compilers are built.</para></listitem>
+</itemizedlist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>There is no need to use the <userinput>bootstrap</userinput> target now,
+as the compiler we're using to compile this GCC was built from the exact same
+version of the GCC sources we used earlier.</para>
+
+<note><para>It's worth pointing out that running the GCC test suite here
+is considered not as important as running it in
+<xref linkend="chapter06"/>.</para></note>
+
+<para>Test the results:</para>
+
+<screen><userinput>make -k check</userinput></screen>
+
+<para>The <userinput>-k</userinput> flag is used to make the test suite run
+through to completion and not stop at the first failure. The GCC test suite is
+very comprehensive and is almost guaranteed to generate a few failures. To get
+a summary of the test suite results, run this:</para>
+
+<screen><userinput>../gcc-&gcc-version;/contrib/test_summary | more</userinput></screen>
+
+<para>You can compare your results to those posted to the gcc-testresults
+mailing list for similar configurations to your own. For an example of how
+current GCC-&gcc-version; should look on i686-pc-linux-gnu, see
+<ulink url="http://gcc.gnu.org/ml/gcc-testresults/2003-08/msg01612.html"/>.</para>
+
+<para>Note that the results contain:</para>
+
+<screen>* 1 XPASS (unexpected pass) for g++
+* 1 FAIL (unexpected failure) for g++
+* 2 FAIL for gcc
+* 26 XPASS's for libstdc++</screen>
+
+<para>The unexpected pass for g++ is due to the use of
+<userinput>--enable-__cxa_atexit</userinput>. Apparently not all platforms
+supported by GCC have support for "__cxa_atexit" in their C libraries, so this
+test is not always expected to pass.</para>
+
+<para>The 26 unexpected passes for libstdc++ are due to the use of
+<userinput>--enable-clocale=gnu</userinput>, which is the correct choice on
+Glibc-based systems of versions 2.2.5 and above. The underlying locale support
+in the GNU C library is superior to that of the otherwise selected "generic"
+model (which may be applicable if for instance you were using Newlibc, Sun-libc
+or whatever libc). The libstdc++ test suite is apparently expecting the
+"generic" model, hence those tests are not always expected to pass.</para>
+
+<para>Unexpected failures often cannot be avoided. The GCC developers are
+usually aware of them but haven't yet gotten around to fixing them. In short,
+unless your results are vastly different from those at the above URL, it is safe
+to continue on.</para>
+
+<para>And finally install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<note><para>At this point it is strongly recommended to repeat the sanity check
+we performed earlier in the chapter. Refer back to
+<xref linkend="ch05-locking-glibc"/> and repeat the check. If the results are
+wrong, then most likely you forgot to apply the above mentioned GCC Specs
+patch.</para></note>
+
+</sect2>
</sect1>
diff --git a/chapter05/gettext-inst.xml b/chapter05/gettext-inst.xml
deleted file mode 100644
index 0d6c1f9da..000000000
--- a/chapter05/gettext-inst.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Gettext</title>
-
-<para>Prepare Gettext to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the programs:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. However, the Gettext test suite here in
-Chapter 5 is known to experience failures under certain host conditions -- for
-example, if it finds a Java compiler on the host. The Gettext test suite takes
-a very long time to run and is not considered critical. Therefore, we don't
-recommend running it here. Should you choose to run it, the following command
-will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 744a33213..d2303c663 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -7,6 +7,35 @@ Estimated required disk space: &gettext-compsize-tools;</screen>
&aa-gettext-shortdesc;
&aa-gettext-dep;
-&c5-gettext-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Gettext</title>
+
+<para>Prepare Gettext to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the programs:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. However, the Gettext test suite here in
+Chapter 5 is known to experience failures under certain host conditions -- for
+example, if it finds a Java compiler on the host. The Gettext test suite takes
+a very long time to run and is not considered critical. Therefore, we don't
+recommend running it here. Should you choose to run it, the following command
+will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter05/glibc-inst.xml b/chapter05/glibc-inst.xml
deleted file mode 100644
index b75a87be1..000000000
--- a/chapter05/glibc-inst.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Glibc installation</title>
-
-<para>Before starting to install Glibc, you must <userinput>cd</userinput>
-into the <filename>glibc-&glibc-version;</filename> directory and unpack
-Glibc-linuxthreads in that directory, not in the directory where you usually
-unpack all the sources.</para>
-
-<note><para>We are going to run the test suite for Glibc in this chapter.
-However, it's worth pointing out that running the Glibc test suite here
-is considered not as important as running it in
-<xref linkend="chapter06"/>.</para></note>
-
-<para>This package is known to behave badly when you have changed its
-default optimization flags (including the -march and -mcpu options).
-Therefore, if you have defined any environment variables that override
-default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
-them when building Glibc.</para>
-
-<para>Basically, compiling Glibc in any other way than the book suggests
-is putting the stability of your system at risk.</para>
-
-<para>Though it is a harmless message, the install stage of Glibc will
-complain about the absence of <filename>/tools/etc/ld.so.conf</filename>.
-Fix this annoying little warning with:</para>
-
-<screen><userinput>mkdir /tools/etc
-touch /tools/etc/ld.so.conf</userinput></screen>
-
-<para>Also, Glibc has a subtle problem when compiled with GCC &gcc-version;.
-Apply the following patch to fix this:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-sscanf-patch;</userinput></screen>
-
-<para>The Glibc documentation recommends building Glibc outside of the source
-directory in a dedicated build directory:</para>
-
-<screen><userinput>mkdir ../glibc-build
-cd ../glibc-build</userinput></screen>
-
-<para>Next, prepare Glibc to be compiled:</para>
-
-<screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-profile --enable-add-ons \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-headers=/tools/include \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-binutils=/tools/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;--without-gd</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--disable-profile</userinput>: This disables the
-building of the libraries with profiling information. Omit this option if you
-plan to do profiling.</para></listitem>
-
-<listitem><para><userinput>--enable-add-ons</userinput>: This enables any
-add-ons that were installed with Glibc, in our case Linuxthreads.</para></listitem>
-
-<listitem><para><userinput>--with-binutils=/tools/bin</userinput> and
-<userinput>--with-headers=/tools/include</userinput>: Strictly speaking
-these switches are not required. But they ensure nothing can go wrong with
-regard to what kernel headers and Binutils programs get used during the
-Glibc build.</para></listitem>
-
-<listitem><para><userinput> --without-gd</userinput>: This switch ensures
-that we don't build the <userinput>memusagestat</userinput> program, which
-strangely enough insists on linking against the host's libraries (libgd,
-libpng, libz, and so forth).</para></listitem>
-</itemizedlist>
-
-<para>During this stage you might see the following warning:</para>
-
-<blockquote><screen>configure: WARNING:
-*** These auxiliary programs are missing or incompatible versions: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</screen></blockquote>
-
-<para>The missing or incompatible <filename>msgfmt</filename> program is
-generally harmless, but it's believed it can sometimes cause problems when
-running the test suite.</para>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Run the test suite:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>The Glibc test suite is highly dependent on certain functions of your host
-system, in particular the kernel. Additionally, here in this chapter some tests
-can be adversely affected by existing tools or environmental issues on the host
-system. Of course, these won't be a problem when we run the Glibc test suite
-inside the chroot environment of <xref linkend="chapter06"/>. In general, the
-Glibc test suite is always expected to pass. However, as mentioned above, some
-failures are unavoidable in certain circumstances. Here is a list of the most
-common issues we are aware of:</para>
-
-<itemizedlist>
-<listitem><para>The <emphasis>math</emphasis> tests sometimes fail when running
-on systems where the CPU is not a relatively new genuine Intel or authentic AMD.
-Certain optimization settings are also known to be a factor here.</para></listitem>
-
-<listitem><para>The <emphasis>gettext</emphasis> test sometimes fails due to
-host system issues. The exact reasons are not yet clear.</para></listitem>
-
-<listitem><para>The <emphasis>atime</emphasis> test sometimes fails when the
-LFS partition is mounted with the <emphasis>noatime</emphasis> option, or due
-to other file system quirks.</para></listitem>
-
-<listitem><para>The <emphasis>shm</emphasis> test might fail when the host
-system is running the devfs file system but doesn't have the tmpfs file system
-mounted at <filename>/dev/shm</filename> due to lack of support for tmpfs in
-the kernel.</para></listitem>
-
-<listitem><para>When running on older and slower hardware, some tests might
-fail due to test timeouts being exceeded.</para></listitem>
-</itemizedlist>
-
-<para>In summary, don't worry too much if you see Glibc test suite failures
-here in this chapter. The Glibc in <xref linkend="chapter06"/> is the one we'll
-ultimately end up using so that is the one we would really like to see pass.
-But please keep in mind, even in <xref linkend="chapter06"/> some failures
-could still occur -- the <emphasis>math</emphasis>
-tests for example. When experiencing a failure, make a note of it, then
-continue by reissuing the <userinput>make check</userinput>. The test suite
-should pick up where it left off and continue on. You can circumvent this
-stop-start sequence by issuing a <userinput>make -k check</userinput>. But if
-you do that, be sure to log the output so that you can later peruse the log
-file and examine the total number of failures.</para>
-
-<para>Now install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Different countries and cultures have varying conventions for how to
-communicate. These conventions range from very simple ones, such as the format
-for representing dates and times, to very complex ones, such as the language
-spoken. The "internationalization" of GNU programs works by means of
-<emphasis>locales</emphasis>. We'll install the Glibc locales now:</para>
-
-<screen><userinput>make localedata/install-locales</userinput></screen>
-
-<para>An alternative to running the previous command is to install only
-those locales which you need or want. This can be achieved by using the
-<userinput>localedef</userinput> command. Information on this can be
-found in the <filename>INSTALL</filename> file in the
-<filename>glibc-&glibc-version;</filename> source. However, there are a number
-of locales that are essential for the tests of future packages to pass, in
-particular, the <emphasis>libstdc++</emphasis> tests from GCC. The following
-instructions, instead of the install-locales target above, will install
-the minimum set of locales necessary for the tests to run successfully:</para>
-
-<screen><userinput>mkdir -p /tools/lib/locale
-localedef -i de_DE -f ISO-8859-1 de_DE
-localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
-localedef -i en_HK -f ISO-8859-1 en_HK
-localedef -i en_PH -f ISO-8859-1 en_PH
-localedef -i en_US -f ISO-8859-1 en_US
-localedef -i es_MX -f ISO-8859-1 es_MX
-localedef -i fr_FR -f ISO-8859-1 fr_FR
-localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
-localedef -i it_IT -f ISO-8859-1 it_IT
-localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 1a2fa38aa..3077438b4 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -7,7 +7,175 @@ Estimated required disk space: &glibc-compsize-tools;</screen>
&aa-glibc-shortdesc;
&aa-glibc-dep;
-&c5-glibc-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Glibc installation</title>
+
+<para>Before starting to install Glibc, you must <userinput>cd</userinput>
+into the <filename>glibc-&glibc-version;</filename> directory and unpack
+Glibc-linuxthreads in that directory, not in the directory where you usually
+unpack all the sources.</para>
+
+<note><para>We are going to run the test suite for Glibc in this chapter.
+However, it's worth pointing out that running the Glibc test suite here
+is considered not as important as running it in
+<xref linkend="chapter06"/>.</para></note>
+
+<para>This package is known to behave badly when you have changed its
+default optimization flags (including the -march and -mcpu options).
+Therefore, if you have defined any environment variables that override
+default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
+them when building Glibc.</para>
+
+<para>Basically, compiling Glibc in any other way than the book suggests
+is putting the stability of your system at risk.</para>
+
+<para>Though it is a harmless message, the install stage of Glibc will
+complain about the absence of <filename>/tools/etc/ld.so.conf</filename>.
+Fix this annoying little warning with:</para>
+
+<screen><userinput>mkdir /tools/etc
+touch /tools/etc/ld.so.conf</userinput></screen>
+
+<para>Also, Glibc has a subtle problem when compiled with GCC &gcc-version;.
+Apply the following patch to fix this:</para>
+
+<screen><userinput>patch -Np1 -i ../&glibc-sscanf-patch;</userinput></screen>
+
+<para>The Glibc documentation recommends building Glibc outside of the source
+directory in a dedicated build directory:</para>
+
+<screen><userinput>mkdir ../glibc-build
+cd ../glibc-build</userinput></screen>
+
+<para>Next, prepare Glibc to be compiled:</para>
+
+<screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-profile --enable-add-ons \
+&nbsp;&nbsp;&nbsp;&nbsp;--with-headers=/tools/include \
+&nbsp;&nbsp;&nbsp;&nbsp;--with-binutils=/tools/bin \
+&nbsp;&nbsp;&nbsp;&nbsp;--without-gd</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--disable-profile</userinput>: This disables the
+building of the libraries with profiling information. Omit this option if you
+plan to do profiling.</para></listitem>
+
+<listitem><para><userinput>--enable-add-ons</userinput>: This enables any
+add-ons that were installed with Glibc, in our case Linuxthreads.</para></listitem>
+
+<listitem><para><userinput>--with-binutils=/tools/bin</userinput> and
+<userinput>--with-headers=/tools/include</userinput>: Strictly speaking
+these switches are not required. But they ensure nothing can go wrong with
+regard to what kernel headers and Binutils programs get used during the
+Glibc build.</para></listitem>
+
+<listitem><para><userinput> --without-gd</userinput>: This switch ensures
+that we don't build the <userinput>memusagestat</userinput> program, which
+strangely enough insists on linking against the host's libraries (libgd,
+libpng, libz, and so forth).</para></listitem>
+</itemizedlist>
+
+<para>During this stage you might see the following warning:</para>
+
+<blockquote><screen>configure: WARNING:
+*** These auxiliary programs are missing or incompatible versions: msgfmt
+*** some features will be disabled.
+*** Check the INSTALL file for required versions.</screen></blockquote>
+
+<para>The missing or incompatible <filename>msgfmt</filename> program is
+generally harmless, but it's believed it can sometimes cause problems when
+running the test suite.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Run the test suite:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>The Glibc test suite is highly dependent on certain functions of your host
+system, in particular the kernel. Additionally, here in this chapter some tests
+can be adversely affected by existing tools or environmental issues on the host
+system. Of course, these won't be a problem when we run the Glibc test suite
+inside the chroot environment of <xref linkend="chapter06"/>. In general, the
+Glibc test suite is always expected to pass. However, as mentioned above, some
+failures are unavoidable in certain circumstances. Here is a list of the most
+common issues we are aware of:</para>
+
+<itemizedlist>
+<listitem><para>The <emphasis>math</emphasis> tests sometimes fail when running
+on systems where the CPU is not a relatively new genuine Intel or authentic AMD.
+Certain optimization settings are also known to be a factor here.</para></listitem>
+
+<listitem><para>The <emphasis>gettext</emphasis> test sometimes fails due to
+host system issues. The exact reasons are not yet clear.</para></listitem>
+
+<listitem><para>The <emphasis>atime</emphasis> test sometimes fails when the
+LFS partition is mounted with the <emphasis>noatime</emphasis> option, or due
+to other file system quirks.</para></listitem>
+
+<listitem><para>The <emphasis>shm</emphasis> test might fail when the host
+system is running the devfs file system but doesn't have the tmpfs file system
+mounted at <filename>/dev/shm</filename> due to lack of support for tmpfs in
+the kernel.</para></listitem>
+
+<listitem><para>When running on older and slower hardware, some tests might
+fail due to test timeouts being exceeded.</para></listitem>
+</itemizedlist>
+
+<para>In summary, don't worry too much if you see Glibc test suite failures
+here in this chapter. The Glibc in <xref linkend="chapter06"/> is the one we'll
+ultimately end up using so that is the one we would really like to see pass.
+But please keep in mind, even in <xref linkend="chapter06"/> some failures
+could still occur -- the <emphasis>math</emphasis>
+tests for example. When experiencing a failure, make a note of it, then
+continue by reissuing the <userinput>make check</userinput>. The test suite
+should pick up where it left off and continue on. You can circumvent this
+stop-start sequence by issuing a <userinput>make -k check</userinput>. But if
+you do that, be sure to log the output so that you can later peruse the log
+file and examine the total number of failures.</para>
+
+<para>Now install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Different countries and cultures have varying conventions for how to
+communicate. These conventions range from very simple ones, such as the format
+for representing dates and times, to very complex ones, such as the language
+spoken. The "internationalization" of GNU programs works by means of
+<emphasis>locales</emphasis>. We'll install the Glibc locales now:</para>
+
+<screen><userinput>make localedata/install-locales</userinput></screen>
+
+<para>An alternative to running the previous command is to install only
+those locales which you need or want. This can be achieved by using the
+<userinput>localedef</userinput> command. Information on this can be
+found in the <filename>INSTALL</filename> file in the
+<filename>glibc-&glibc-version;</filename> source. However, there are a number
+of locales that are essential for the tests of future packages to pass, in
+particular, the <emphasis>libstdc++</emphasis> tests from GCC. The following
+instructions, instead of the install-locales target above, will install
+the minimum set of locales necessary for the tests to run successfully:</para>
+
+<screen><userinput>mkdir -p /tools/lib/locale
+localedef -i de_DE -f ISO-8859-1 de_DE
+localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
+localedef -i en_HK -f ISO-8859-1 en_HK
+localedef -i en_PH -f ISO-8859-1 en_PH
+localedef -i en_US -f ISO-8859-1 en_US
+localedef -i es_MX -f ISO-8859-1 es_MX
+localedef -i fr_FR -f ISO-8859-1 fr_FR
+localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
+localedef -i it_IT -f ISO-8859-1 it_IT
+localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml
deleted file mode 100644
index d613ed5c5..000000000
--- a/chapter05/grep-inst.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Grep</title>
-
-<para>Prepare Grep to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-perl-regexp --with-included-regex</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--disable-perl-regexp</userinput>: This makes sure
-that <userinput>grep</userinput> does not get linked against a PCRE library
-that may be present on the host, but would not be available once we enter the
-chroot environment.</para></listitem>
-<listitem><para><userinput>--with-included-regex</userinput>: This ensures that
-Grep uses its internal regular expression code. Without it, it will use
-the code from Glibc, which is known to be slightly buggy.</para></listitem>
-</itemizedlist>
-
-<para>Compile the programs:</para>
-
-<screen><userinput>make </userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Then install them and their documentation:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 2003512b2..7e2e544a5 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -7,7 +7,44 @@ Estimated required disk space: &grep-compsize-tools;</screen>
&aa-grep-shortdesc;
&aa-grep-dep;
-&c5-grep-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Grep</title>
+
+<para>Prepare Grep to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools \
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-perl-regexp --with-included-regex</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--disable-perl-regexp</userinput>: This makes sure
+that <userinput>grep</userinput> does not get linked against a PCRE library
+that may be present on the host, but would not be available once we enter the
+chroot environment.</para></listitem>
+<listitem><para><userinput>--with-included-regex</userinput>: This ensures that
+Grep uses its internal regular expression code. Without it, it will use
+the code from Glibc, which is known to be slightly buggy.</para></listitem>
+</itemizedlist>
+
+<para>Compile the programs:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Then install them and their documentation:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml
deleted file mode 100644
index 5fc2ff79f..000000000
--- a/chapter05/gzip-inst.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Gzip</title>
-
-<para>Prepare Gzip to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 5211e69a6..52f875b29 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -7,7 +7,25 @@ Estimated required disk space: &gzip-compsize-tools;</screen>
&aa-gzip-shortdesc;
&aa-gzip-dep;
-&c5-gzip-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Gzip</title>
+
+<para>Prepare Gzip to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/kernelheaders-inst.xml b/chapter05/kernelheaders-inst.xml
deleted file mode 100644
index ecfa07732..000000000
--- a/chapter05/kernelheaders-inst.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of the kernel headers</title>
-
-<para>As some packages need to refer to the kernel header files, we're going
-to unpack the kernel archive now, set it up, and copy the required files to a
-place where <userinput>gcc</userinput> can later find them.</para>
-
-<para>Prepare for the header installation with:</para>
-
-<screen><userinput>make mrproper</userinput></screen>
-
-<para>This ensures that the kernel tree is absolutely clean. The kernel team
-recommends that this command be issued prior to <emphasis>each</emphasis> kernel
-compilation. You shouldn't rely on the source tree being clean after
-untarring.</para>
-
-<para>Create the <filename>include/linux/version.h</filename> file:</para>
-
-<screen><userinput>make include/linux/version.h</userinput></screen>
-
-<para>Create the platform-specific <filename>include/asm</filename>
-symlink:</para>
-
-<screen><userinput>make symlinks</userinput></screen>
-
-<para>Install the platform-specific header files:</para>
-
-<screen><userinput>mkdir /tools/include/asm
-cp include/asm/* /tools/include/asm
-cp -R include/asm-generic /tools/include</userinput></screen>
-
-<para>Install the cross-platform kernel header files:</para>
-
-<screen><userinput>cp -R include/linux /tools/include</userinput></screen>
-
-<para>There are a few kernel header files which make use of the
-<filename>autoconf.h</filename> header file. Since we do not yet configure the
-kernel, we need to create this file ourselves in order to avoid compilation
-failures. Create an empty <filename>autoconf.h</filename> file:</para>
-
-<screen><userinput>touch /tools/include/linux/autoconf.h</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/kernelheaders.xml b/chapter05/kernelheaders.xml
index 8c4e7ca92..a5f3e3a0b 100644
--- a/chapter05/kernelheaders.xml
+++ b/chapter05/kernelheaders.xml
@@ -7,7 +7,52 @@ Estimated required disk space: &kernel-compsize-headers;</screen>
&aa-kernel-shortdesc;
&aa-kernel-dep;
-&c5-kernelheaders-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of the kernel headers</title>
+
+<para>As some packages need to refer to the kernel header files, we're going
+to unpack the kernel archive now, set it up, and copy the required files to a
+place where <userinput>gcc</userinput> can later find them.</para>
+
+<para>Prepare for the header installation with:</para>
+
+<screen><userinput>make mrproper</userinput></screen>
+
+<para>This ensures that the kernel tree is absolutely clean. The kernel team
+recommends that this command be issued prior to <emphasis>each</emphasis> kernel
+compilation. You shouldn't rely on the source tree being clean after
+untarring.</para>
+
+<para>Create the <filename>include/linux/version.h</filename> file:</para>
+
+<screen><userinput>make include/linux/version.h</userinput></screen>
+
+<para>Create the platform-specific <filename>include/asm</filename>
+symlink:</para>
+
+<screen><userinput>make symlinks</userinput></screen>
+
+<para>Install the platform-specific header files:</para>
+
+<screen><userinput>mkdir /tools/include/asm
+cp include/asm/* /tools/include/asm
+cp -R include/asm-generic /tools/include</userinput></screen>
+
+<para>Install the cross-platform kernel header files:</para>
+
+<screen><userinput>cp -R include/linux /tools/include</userinput></screen>
+
+<para>There are a few kernel header files which make use of the
+<filename>autoconf.h</filename> header file. Since we do not yet configure the
+kernel, we need to create this file ourselves in order to avoid compilation
+failures. Create an empty <filename>autoconf.h</filename> file:</para>
+
+<screen><userinput>touch /tools/include/linux/autoconf.h</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml
deleted file mode 100644
index d9e32bff7..000000000
--- a/chapter05/make-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Make</title>
-
-<para>Prepare Make to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the program:</para>
-
-<screen><userinput>make </userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Then install it and its documentation:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/make.xml b/chapter05/make.xml
index 1a51acc3b..22cc4c543 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -7,7 +7,31 @@ Estimated required disk space: &make-compsize-tools;</screen>
&aa-make-shortdesc;
&aa-make-dep;
-&c5-make-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Make</title>
+
+<para>Prepare Make to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the program:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Then install it and its documentation:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/ncurses-inst.xml b/chapter05/ncurses-inst.xml
deleted file mode 100644
index dea216194..000000000
--- a/chapter05/ncurses-inst.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Ncurses</title>
-
-<para>Fix two minor things:</para>
-
-<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;
-patch -Np1 -i ../&ncurses-vsscanf-patch;</userinput></screen>
-
-<para>The first patch corrects the <filename>etip.h</filename> header file, and
-the second patch prevents some compiler warnings being issued on the use of
-deprecated headers.</para>
-
-<para>Now prepare Ncurses to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools --with-shared \
-&nbsp;&nbsp;&nbsp;&nbsp;--without-debug --without-ada --enable-overwrite</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--without-ada</userinput>: This tells Ncurses not
-to build its Ada bindings, even if an Ada compiler is installed on the host.
-This must be done because once we enter the chroot environment, Ada will no
-longer be available.</para></listitem>
-
-<listitem><para><userinput>--enable-overwrite</userinput>: This tells Ncurses
-to install its header files into <filename class="directory">/tools/include</filename>
-instead of <filename class="directory">/tools/include/ncurses</filename> to
-ensure that other packages can find the Ncurses headers successfully.</para>
-</listitem></itemizedlist>
-
-<para>Compile the programs and libraries:</para>
-
-<screen><userinput>make </userinput></screen>
-
-<para>Then install them and their documentation:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index b8c8a4465..9e02eaa4e 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -7,7 +7,49 @@ Estimated required disk space: &ncurses-compsize-tools;</screen>
&aa-ncurses-shortdesc;
&aa-ncurses-dep;
-&c5-ncurses-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Ncurses</title>
+
+<para>Fix two minor things:</para>
+
+<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;
+patch -Np1 -i ../&ncurses-vsscanf-patch;</userinput></screen>
+
+<para>The first patch corrects the <filename>etip.h</filename> header file, and
+the second patch prevents some compiler warnings being issued on the use of
+deprecated headers.</para>
+
+<para>Now prepare Ncurses to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools --with-shared \
+&nbsp;&nbsp;&nbsp;&nbsp;--without-debug --without-ada --enable-overwrite</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--without-ada</userinput>: This tells Ncurses not
+to build its Ada bindings, even if an Ada compiler is installed on the host.
+This must be done because once we enter the chroot environment, Ada will no
+longer be available.</para></listitem>
+
+<listitem><para><userinput>--enable-overwrite</userinput>: This tells Ncurses
+to install its header files into <filename class="directory">/tools/include</filename>
+instead of <filename class="directory">/tools/include/ncurses</filename> to
+ensure that other packages can find the Ncurses headers successfully.</para>
+</listitem></itemizedlist>
+
+<para>Compile the programs and libraries:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<para>Then install them and their documentation:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml
deleted file mode 100644
index a04fec408..000000000
--- a/chapter05/patch-inst.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Patch</title>
-
-<para>Prepare Patch to be compiled:</para>
-
-<screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/tools</userinput></screen>
-
-<para>The preprocessor flag <userinput>-D_GNU_SOURCE</userinput> is only needed
-on the PowerPC platform. On other architectures you can leave it out.</para>
-
-<para>Compile the program:</para>
-
-<screen><userinput>make </userinput></screen>
-
-<para>Then install it and its documentation:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index f2471acad..7242ac399 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -7,7 +7,28 @@ Estimated required disk space: &patch-compsize-tools;</screen>
&aa-patch-shortdesc;
&aa-patch-dep;
-&c5-patch-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Patch</title>
+
+<para>Prepare Patch to be compiled:</para>
+
+<screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/tools</userinput></screen>
+
+<para>The preprocessor flag <userinput>-D_GNU_SOURCE</userinput> is only needed
+on the PowerPC platform. On other architectures you can leave it out.</para>
+
+<para>Compile the program:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<para>Then install it and its documentation:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/perl-inst.xml b/chapter05/perl-inst.xml
deleted file mode 100644
index 8b996c447..000000000
--- a/chapter05/perl-inst.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2>
-<title>Installation of Perl</title>
-
-<para>First adapt some hard-wired paths to the C library:</para>
-
-<screen><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
-
-<para>And make sure some static extensions get built:</para>
-
-<screen><userinput>chmod u+w hints/linux.sh
-echo 'static_ext="IO re Fcntl"' >> hints/linux.sh</userinput></screen>
-
-<para>Now prepare Perl for compilation:</para>
-
-<screen><userinput>./configure.gnu --prefix=/tools</userinput></screen>
-
-<para>Compile only the required tools:</para>
-
-<screen><userinput>make perl utilities</userinput></screen>
-
-<para>Then copy these tools and their libraries:</para>
-
-<screen><userinput>cp perl pod/pod2man /tools/bin
-mkdir -p /tools/lib/perl5/&perl-version;
-cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index d1ab2cafe..21ec2f969 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -7,7 +7,35 @@ Estimated required disk space: &perl-compsize-tools;</screen>
&aa-perl-shortdesc;
&aa-perl-dep;
-&c5-perl-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+<sect2>
+<title>Installation of Perl</title>
+
+<para>First adapt some hard-wired paths to the C library:</para>
+
+<screen><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
+
+<para>And make sure some static extensions get built:</para>
+
+<screen><userinput>chmod u+w hints/linux.sh
+echo 'static_ext="IO re Fcntl"' >> hints/linux.sh</userinput></screen>
+
+<para>Now prepare Perl for compilation:</para>
+
+<screen><userinput>./configure.gnu --prefix=/tools</userinput></screen>
+
+<para>Compile only the required tools:</para>
+
+<screen><userinput>make perl utilities</userinput></screen>
+
+<para>Then copy these tools and their libraries:</para>
+
+<screen><userinput>cp perl pod/pod2man /tools/bin
+mkdir -p /tools/lib/perl5/&perl-version;
+cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml
deleted file mode 100644
index 7ea6c6bf3..000000000
--- a/chapter05/sed-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Sed</title>
-
-<para>Prepare Sed to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the program:</para>
-
-<screen><userinput>make </userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Then install it and its documentation:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index fe3c627d6..88e432ed2 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -7,7 +7,31 @@ Estimated required disk space: &sed-compsize-tools;</screen>
&aa-sed-shortdesc;
&aa-sed-dep;
-&c5-sed-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Sed</title>
+
+<para>Prepare Sed to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the program:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Then install it and its documentation:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml
deleted file mode 100644
index 47c47ae88..000000000
--- a/chapter05/tar-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Tar</title>
-
-<para>Prepare Tar to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the programs:</para>
-
-<screen><userinput>make </userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Then install them and their documentation:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 1011e943a..65f3dd19e 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -7,7 +7,31 @@ Estimated required disk space: &tar-compsize-tools;</screen>
&aa-tar-shortdesc;
&aa-tar-dep;
-&c5-tar-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Tar</title>
+
+<para>Prepare Tar to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the programs:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Then install them and their documentation:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/tcl-inst.xml b/chapter05/tcl-inst.xml
deleted file mode 100644
index c70070bf5..000000000
--- a/chapter05/tcl-inst.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Tcl</title>
-
-<para>This package and the next two are only installed to be able to run the
-test suites for GCC and Binutils. Installing three packages just for testing
-purposes may seem like overkill, but it is very reassuring, if not essential,
-to know that our most important tools are working properly.</para>
-
-<para>Prepare Tcl to be compiled:</para>
-
-<screen><userinput>cd unix
-./configure --prefix=/tools</userinput></screen>
-
-<para>Build the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. However, the Tcl test suite in this
-chapter is known to experience failures under certain host conditions that are
-not fully understood. Therefore, test suite failures here are not surprising,
-but are not considered critical. Should you choose to run the test suite, the
-following command will do so:</para>
-
-<screen><userinput>TZ=UTC make test</userinput></screen>
-
-<para>The meaning of the make option:</para>
-
-<itemizedlist>
-<listitem><para><userinput>TZ=UTC</userinput>: This sets the time zone to
-Coordinated Universal Time (UTC) also known as Greenwich Mean Time (GMT), but
-only for the duration of the test suite run. This ensures the clock tests are
-exercised correctly. More information on the TZ environment variable is
-available later on in <xref linkend="chapter07"/>.</para></listitem>
-</itemizedlist>
-
-<para>Sometimes, package test suites will give false failures. You can
-consult the LFS Wiki at <ulink url="http://wiki.linuxfromscratch.org/"/>
-to verify that these failures are normal. This applies to all tests
-throughout the book.</para>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<important><para><emphasis>Do not remove</emphasis> the
-<filename>tcl&tcl-version;</filename> source directory yet, as the next package
-will need its internal headers.</para></important>
-
-<para>Make a necessary symbolic link:</para>
-
-<screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 1813c50b2..c7863f457 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -7,7 +7,63 @@ Estimated required disk space: &tcl-compsize-tools;</screen>
&aa-tcl-shortdesc;
&aa-tcl-dep;
-&c5-tcl-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Tcl</title>
+
+<para>This package and the next two are only installed to be able to run the
+test suites for GCC and Binutils. Installing three packages just for testing
+purposes may seem like overkill, but it is very reassuring, if not essential,
+to know that our most important tools are working properly.</para>
+
+<para>Prepare Tcl to be compiled:</para>
+
+<screen><userinput>cd unix
+./configure --prefix=/tools</userinput></screen>
+
+<para>Build the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. However, the Tcl test suite in this
+chapter is known to experience failures under certain host conditions that are
+not fully understood. Therefore, test suite failures here are not surprising,
+but are not considered critical. Should you choose to run the test suite, the
+following command will do so:</para>
+
+<screen><userinput>TZ=UTC make test</userinput></screen>
+
+<para>The meaning of the make option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>TZ=UTC</userinput>: This sets the time zone to
+Coordinated Universal Time (UTC) also known as Greenwich Mean Time (GMT), but
+only for the duration of the test suite run. This ensures the clock tests are
+exercised correctly. More information on the TZ environment variable is
+available later on in <xref linkend="chapter07"/>.</para></listitem>
+</itemizedlist>
+
+<para>Sometimes, package test suites will give false failures. You can
+consult the LFS Wiki at <ulink url="http://wiki.linuxfromscratch.org/"/>
+to verify that these failures are normal. This applies to all tests
+throughout the book.</para>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<important><para><emphasis>Do not remove</emphasis> the
+<filename>tcl&tcl-version;</filename> source directory yet, as the next package
+will need its internal headers.</para></important>
+
+<para>Make a necessary symbolic link:</para>
+
+<screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml
deleted file mode 100644
index 415226e4a..000000000
--- a/chapter05/texinfo-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Texinfo</title>
-
-<para>Prepare Texinfo to be compiled:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-<para>Compile the programs:</para>
-
-<screen><userinput>make </userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Then install them and their documentation:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index 53a4beaff..676b06752 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -7,7 +7,31 @@ Estimated required disk space: &texinfo-compsize-tools;</screen>
&aa-texinfo-shortdesc;
&aa-texinfo-dep;
-&c5-texinfo-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Texinfo</title>
+
+<para>Prepare Texinfo to be compiled:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+<para>Compile the programs:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Then install them and their documentation:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter05/utillinux-inst.xml b/chapter05/utillinux-inst.xml
deleted file mode 100644
index a38cb26c4..000000000
--- a/chapter05/utillinux-inst.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Util-linux</title>
-
-<para>Util-linux doesn't use the freshly installed headers and libraries from
-the /tools directory. This is fixed by altering the configure script:</para>
-
-<screen><userinput>cp configure configure.backup
-sed "s@/usr/include@/tools/include@g" configure.backup &gt; configure</userinput> </screen>
-
-<para>Prepare Util-linux for compilation:</para>
-
-<screen><userinput>./configure</userinput></screen>
-
-<para>Compile some support routines:</para>
-
-<screen><userinput>make -C lib</userinput></screen>
-
-<para>And, since you'll need only a couple of the utilities contained in this
-package, build just those:</para>
-
-<screen><userinput>make -C mount mount umount
-make -C text-utils more</userinput></screen>
-
-<para>Now copy these programs to the temporary tools directory:</para>
-
-<screen><userinput>cp mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
-
-</sect2>
-
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index 0e0d7ff05..33c79ff99 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -7,6 +7,37 @@ Estimated required disk space: &util-linux-compsize-tools;</screen>
&aa-utillinux-shortdesc;
&aa-utillinux-dep;
-&c5-utillinux-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Util-linux</title>
+
+<para>Util-linux doesn't use the freshly installed headers and libraries from
+the /tools directory. This is fixed by altering the configure script:</para>
+
+<screen><userinput>cp configure configure.backup
+sed "s@/usr/include@/tools/include@g" configure.backup &gt; configure</userinput> </screen>
+
+<para>Prepare Util-linux for compilation:</para>
+
+<screen><userinput>./configure</userinput></screen>
+
+<para>Compile some support routines:</para>
+
+<screen><userinput>make -C lib</userinput></screen>
+
+<para>And, since you'll need only a couple of the utilities contained in this
+package, build just those:</para>
+
+<screen><userinput>make -C mount mount umount
+make -C text-utils more</userinput></screen>
+
+<para>Now copy these programs to the temporary tools directory:</para>
+
+<screen><userinput>cp mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/autoconf-inst.xml b/chapter06/autoconf-inst.xml
deleted file mode 100644
index a0d7ac9e4..000000000
--- a/chapter06/autoconf-inst.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2>
-<title>Installation of Autoconf</title>
-
-<para>Prepare Autoconf for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 0331a04c9..0d43410fa 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -7,6 +7,30 @@ Estimated required disk space: &autoconf-compsize;</screen>
&aa-autoconf-shortdesc;
&aa-autoconf-dep;
-&c6-autoconf-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+<sect2>
+<title>Installation of Autoconf</title>
+
+<para>Prepare Autoconf for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/automake-inst.xml b/chapter06/automake-inst.xml
deleted file mode 100644
index 97e0452b8..000000000
--- a/chapter06/automake-inst.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Automake</title>
-
-<para>Prepare Automake for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And create a necessary symbolic link:</para>
-
-<screen><userinput>ln -s automake-1.7 /usr/share/automake</userinput></screen>
-
-</sect2>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index fb821c3b0..e28116cba 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -7,6 +7,35 @@ Estimated required disk space: &automake-compsize;</screen>
&aa-automake-shortdesc;
&aa-automake-dep;
-&c6-automake-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Automake</title>
+
+<para>Prepare Automake for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And create a necessary symbolic link:</para>
+
+<screen><userinput>ln -s automake-1.7 /usr/share/automake</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml
deleted file mode 100644
index 6f1a94e7d..000000000
--- a/chapter06/bash-inst.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Bash</title>
-
-<para>Bash has a number of bugs in it that cause it to not behave the
-way it is expected at times. Fix this behaviour with the following
-patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&bash-patch;</userinput></screen>
-
-<para>Prepare Bash for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make tests</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And reload the newly compiled <userinput>bash</userinput> program:</para>
-
-<screen><userinput>exec /bin/bash --login +h</userinput></screen>
-
-</sect2>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 4ebebe535..c2703142a 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -7,6 +7,41 @@ Estimated required disk space: &bash-compsize;</screen>
&aa-bash-shortdesc;
&aa-bash-dep;
-&c6-bash-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Bash</title>
+
+<para>Bash has a number of bugs in it that cause it to not behave the
+way it is expected at times. Fix this behaviour with the following
+patch:</para>
+
+<screen><userinput>patch -Np1 -i ../&bash-patch;</userinput></screen>
+
+<para>Prepare Bash for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make tests</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And reload the newly compiled <userinput>bash</userinput> program:</para>
+
+<screen><userinput>exec /bin/bash --login +h</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml
deleted file mode 100644
index 81312fe4c..000000000
--- a/chapter06/binutils-inst.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2><title>Installation of Binutils</title>
-
-<para>Now is an appropriate time to verify that your pseudo terminals (PTYs) are
-working properly inside the chroot environment. We will again quickly check that
-everything is set up correctly by performing a simple test:</para>
-
-<screen><userinput>expect -c "spawn ls"</userinput></screen>
-
-<para>If you receive the message:</para>
-
-<blockquote><screen>The system has no more ptys. Ask your system administrator to create more.</screen></blockquote>
-
-<para>Your chroot environment is not set up for proper PTY operation. In this
-case there is no point in running the test suites for Binutils and GCC until you
-are able to resolve the issue. Please refer back to <xref linkend="ch06-proc"/>
-and <xref linkend="ch06-makedev"/> and perform the recommended steps to fix the
-problem.</para>
-
-<note><para>The test suite for Binutils in this section is considered
-<emphasis>critical</emphasis>. Our advice is to not skip it under any
-circumstances.</para> </note>
-
-<para>This package is known to behave badly when you have changed its
-default optimization flags (including the -march and -mcpu options).
-Therefore, if you have defined any environment variables that override
-default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
-or modifying them when building Binutils.</para>
-
-<para>The Binutils documentation recommends building Binutils outside of the
-source directory in a dedicated build directory:</para>
-
-<screen><userinput>mkdir ../binutils-build
-cd ../binutils-build</userinput></screen>
-
-<para>Now prepare Binutils for compilation:</para>
-
-<screen><userinput>../binutils-&binutils-version;/configure \
-&nbsp;&nbsp;&nbsp;&nbsp;--prefix=/usr --enable-shared</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make tooldir=/usr</userinput></screen>
-
-<para>Normally, the <emphasis>tooldir</emphasis> (the directory where the
-executables end up) is set to $(exec_prefix)/$(target_alias), which expands
-into, for example, <filename>/usr/i686-pc-linux-gnu</filename>. Since we only
-build for our own system, we don't need this target specific directory in
-<filename>/usr</filename>. That setup would be used if the system was used to
-cross-compile (for example compiling a package on an Intel machine that
-generates code that can be executed on PowerPC machines).</para>
-
-<para>Test the results:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>The test suite notes from <xref linkend="ch05-binutils-pass2"/> are still
-very much appropriate here. Be sure to refer back there should you have any
-doubts.</para>
-
-<para>Install the package:</para>
-
-<screen><userinput>make tooldir=/usr install</userinput></screen>
-
-<para>Install the <emphasis>libiberty</emphasis> header file that is needed by
-some packages:</para>
-
-<screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 2acece44f..872fff1ab 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -7,6 +7,78 @@ Estimated required disk space: &binutils-compsize;</screen>
&aa-binutils-shortdesc;
&aa-binutils-dep;
-&c6-binutils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2><title>Installation of Binutils</title>
+
+<para>Now is an appropriate time to verify that your pseudo terminals (PTYs) are
+working properly inside the chroot environment. We will again quickly check that
+everything is set up correctly by performing a simple test:</para>
+
+<screen><userinput>expect -c "spawn ls"</userinput></screen>
+
+<para>If you receive the message:</para>
+
+<blockquote><screen>The system has no more ptys. Ask your system administrator to create more.</screen></blockquote>
+
+<para>Your chroot environment is not set up for proper PTY operation. In this
+case there is no point in running the test suites for Binutils and GCC until you
+are able to resolve the issue. Please refer back to <xref linkend="ch06-proc"/>
+and <xref linkend="ch06-makedev"/> and perform the recommended steps to fix the
+problem.</para>
+
+<note><para>The test suite for Binutils in this section is considered
+<emphasis>critical</emphasis>. Our advice is to not skip it under any
+circumstances.</para> </note>
+
+<para>This package is known to behave badly when you have changed its
+default optimization flags (including the -march and -mcpu options).
+Therefore, if you have defined any environment variables that override
+default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
+or modifying them when building Binutils.</para>
+
+<para>The Binutils documentation recommends building Binutils outside of the
+source directory in a dedicated build directory:</para>
+
+<screen><userinput>mkdir ../binutils-build
+cd ../binutils-build</userinput></screen>
+
+<para>Now prepare Binutils for compilation:</para>
+
+<screen><userinput>../binutils-&binutils-version;/configure \
+&nbsp;&nbsp;&nbsp;&nbsp;--prefix=/usr --enable-shared</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make tooldir=/usr</userinput></screen>
+
+<para>Normally, the <emphasis>tooldir</emphasis> (the directory where the
+executables end up) is set to $(exec_prefix)/$(target_alias), which expands
+into, for example, <filename>/usr/i686-pc-linux-gnu</filename>. Since we only
+build for our own system, we don't need this target specific directory in
+<filename>/usr</filename>. That setup would be used if the system was used to
+cross-compile (for example compiling a package on an Intel machine that
+generates code that can be executed on PowerPC machines).</para>
+
+<para>Test the results:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>The test suite notes from <xref linkend="ch05-binutils-pass2"/> are still
+very much appropriate here. Be sure to refer back there should you have any
+doubts.</para>
+
+<para>Install the package:</para>
+
+<screen><userinput>make tooldir=/usr install</userinput></screen>
+
+<para>Install the <emphasis>libiberty</emphasis> header file that is needed by
+some packages:</para>
+
+<screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml
deleted file mode 100644
index 7240736b1..000000000
--- a/chapter06/bison-inst.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Bison</title>
-
-<para>First we use a patch to bison, backported from CVS, which fixes a minor
-compilation problem with some packages:</para>
-
-<screen><userinput>patch -Np1 -i ../&bison-patch;</userinput></screen>
-
-<para>Prepare Bison for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so (and takes a long time):</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 3e469dcc9..e8c2fbf9d 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -7,7 +7,36 @@ Estimated required disk space: &bison-compsize;</screen>
&aa-bison-shortdesc;
&aa-bison-dep;
-&c6-bison-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Bison</title>
+
+<para>First we use a patch to bison, backported from CVS, which fixes a minor
+compilation problem with some packages:</para>
+
+<screen><userinput>patch -Np1 -i ../&bison-patch;</userinput></screen>
+
+<para>Prepare Bison for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so (and takes a long time):</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/bootscripts-inst.xml b/chapter06/bootscripts-inst.xml
deleted file mode 100644
index ef1e60968..000000000
--- a/chapter06/bootscripts-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of LFS-Bootscripts</title>
-
-<para>We will be using SysV style init scripts. We have chosen this style
-because it is widely used and we feel comfortable with it. If you would prefer
-to try something else, Marc Heerdink has written a hint about BSD style init
-scripts, to be found at <ulink url="&hints-root;bsd-init.txt"/>. And if you'd
-like something more radical, search the LFS mailing lists for depinit.</para>
-
-<para>If you decide to use BSD style, or some other style scripts, you can
-skip the next chapter when you arrive at it and move on to
-<xref linkend="chapter08"/>.</para>
-
-<para>Install the boot scripts:</para>
-
-<screen><userinput>cp -a rc.d sysconfig /etc</userinput></screen>
-
-<para>Give <emphasis>root</emphasis> ownership of the scripts:</para>
-
-<screen><userinput>chown -R root:root /etc/rc.d /etc/sysconfig</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/bootscripts.xml b/chapter06/bootscripts.xml
index 94a44f52f..6c3a21963 100644
--- a/chapter06/bootscripts.xml
+++ b/chapter06/bootscripts.xml
@@ -7,7 +7,31 @@ Estimated required disk space: &bootscripts-compsize;</screen>
&aa-bootscripts-shortdesc;
&aa-bootscripts-dep;
-&c6-bootscripts-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of LFS-Bootscripts</title>
+
+<para>We will be using SysV style init scripts. We have chosen this style
+because it is widely used and we feel comfortable with it. If you would prefer
+to try something else, Marc Heerdink has written a hint about BSD style init
+scripts, to be found at <ulink url="&hints-root;bsd-init.txt"/>. And if you'd
+like something more radical, search the LFS mailing lists for depinit.</para>
+
+<para>If you decide to use BSD style, or some other style scripts, you can
+skip the next chapter when you arrive at it and move on to
+<xref linkend="chapter08"/>.</para>
+
+<para>Install the boot scripts:</para>
+
+<screen><userinput>cp -a rc.d sysconfig /etc</userinput></screen>
+
+<para>Give <emphasis>root</emphasis> ownership of the scripts:</para>
+
+<screen><userinput>chown -R root:root /etc/rc.d /etc/sysconfig</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml
deleted file mode 100644
index 87d8c361f..000000000
--- a/chapter06/bzip2-inst.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Bzip2</title>
-
-<para>Prepare Bzip2 for compilation with:</para>
-
-<screen><userinput>make -f Makefile-libbz2_so
-make clean</userinput></screen>
-
-<para>The <emphasis>-f</emphasis> flag will cause Bzip2 to be built
-using a different <filename>Makefile</filename> file, in this case the
-<filename>Makefile-libbz2_so</filename> file, which creates a dynamic
-<filename>libbz2.so</filename> library and links the bzip2 utilities
-against it.</para>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And install the shared <userinput>bzip2</userinput> binary into the
-<filename class="directory">/bin</filename> directory, then make some
-necessary symbolic links, and clean up.</para>
-
-<screen><userinput>cp bzip2-shared /bin/bzip2
-cp -a libbz2.so* /lib
-ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
-rm /usr/bin/{bunzip2,bzcat,bzip2}
-mv /usr/bin/{bzip2recover,bzless,bzmore} /bin
-ln -s bzip2 /bin/bunzip2
-ln -s bzip2 /bin/bzcat</userinput></screen>
-
-</sect2>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 0a1bb3540..bc032f049 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -7,6 +7,44 @@ Estimated required disk space: &bzip2-compsize;</screen>
&aa-bzip2-shortdesc;
&aa-bzip2-dep;
-&c6-bzip2-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Bzip2</title>
+
+<para>Prepare Bzip2 for compilation with:</para>
+
+<screen><userinput>make -f Makefile-libbz2_so
+make clean</userinput></screen>
+
+<para>The <emphasis>-f</emphasis> flag will cause Bzip2 to be built
+using a different <filename>Makefile</filename> file, in this case the
+<filename>Makefile-libbz2_so</filename> file, which creates a dynamic
+<filename>libbz2.so</filename> library and links the bzip2 utilities
+against it.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And install the shared <userinput>bzip2</userinput> binary into the
+<filename class="directory">/bin</filename> directory, then make some
+necessary symbolic links, and clean up.</para>
+
+<screen><userinput>cp bzip2-shared /bin/bzip2
+cp -a libbz2.so* /lib
+ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
+rm /usr/bin/{bunzip2,bzcat,bzip2}
+mv /usr/bin/{bzip2recover,bzless,bzmore} /bin
+ln -s bzip2 /bin/bunzip2
+ln -s bzip2 /bin/bzcat</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml
deleted file mode 100644
index ad17757ee..000000000
--- a/chapter06/coreutils-inst.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Coreutils</title>
-
-<para>Normally the functionality of <userinput>uname</userinput> is somewhat
-broken, in that the <userinput>-p</userinput> switch always returns "unknown".
-The following patch fixes this behaviour for Intel architectures:</para>
-
-<screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
-
-<para>We do not want Coreutils to install its version of the
-<userinput>hostname</userinput> program, because it is inferior to the version
-provided by Net-tools. Prevent its installation by applying a patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&coreutils-hostname-patch;</userinput></screen>
-
-<para>Now prepare Coreutils for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>The <userinput>su</userinput> program from Coreutils wasn't installed in
-Chapter 5 because it needed <emphasis>root</emphasis> privilege to do so. We're
-going to need it in a few moments for the test suite. Therefore we work around
-the problem by installing it now:</para>
-
-<screen><userinput>make install-root</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. However, this particular test suite
-makes some assumptions with regards to the presence of non-root users and
-groups that don't apply this early into the LFS build. We therefore create
-a dummy system user and two dummy groups to allow the tests to run
-properly. Should you choose not to run the test suite, skip down to
-"Install the package". The following commands will prepare us for the test
-suite. Create two dummy groups and a dummy user name:</para>
-
-<screen><userinput>echo "dummy1:x:1000" >> /etc/group
-echo "dummy2:x:1001:dummy" >> /etc/group
-echo "dummy:x:1000:1000:::/bin/bash" >> /etc/passwd</userinput></screen>
-
-<para>Some tests are meant to run as <emphasis>root</emphasis>:</para>
-
-<screen><userinput>make check-root</userinput></screen>
-
-<para>The remainder of the tests are run as the <emphasis>dummy</emphasis>
-user:</para>
-
-<screen><userinput>su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
-
-<para>Remove the dummy groups and user name:</para>
-
-<screen><userinput>sed -i.bak '/dummy/d' /etc/passwd /etc/group</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And move some programs to their proper locations:</para>
-
-<screen><userinput>mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
-mv /usr/bin/{dir,dircolors,du,date,echo,false,head} /bin
-mv /usr/bin/{install,ln,ls,mkdir,mkfifo,mknod,mv,pwd} /bin
-mv /usr/bin/{rm,rmdir,shred,sync,sleep,stty,su,test} /bin
-mv /usr/bin/{touch,true,uname,vdir} /bin
-mv /usr/bin/chroot /usr/sbin</userinput></screen>
-
-<para>Finally, create a few necessary symlinks:</para>
-
-<screen><userinput>ln -s test /bin/[
-ln -s ../../bin/install /usr/bin</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 1ee2c812d..7eeaa69a3 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -7,7 +7,84 @@ Estimated required disk space: &coreutils-compsize;</screen>
&aa-coreutils-shortdesc;
&aa-coreutils-dep;
-&c6-coreutils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Coreutils</title>
+
+<para>Normally the functionality of <userinput>uname</userinput> is somewhat
+broken, in that the <userinput>-p</userinput> switch always returns "unknown".
+The following patch fixes this behaviour for Intel architectures:</para>
+
+<screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
+
+<para>We do not want Coreutils to install its version of the
+<userinput>hostname</userinput> program, because it is inferior to the version
+provided by Net-tools. Prevent its installation by applying a patch:</para>
+
+<screen><userinput>patch -Np1 -i ../&coreutils-hostname-patch;</userinput></screen>
+
+<para>Now prepare Coreutils for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>The <userinput>su</userinput> program from Coreutils wasn't installed in
+Chapter 5 because it needed <emphasis>root</emphasis> privilege to do so. We're
+going to need it in a few moments for the test suite. Therefore we work around
+the problem by installing it now:</para>
+
+<screen><userinput>make install-root</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. However, this particular test suite
+makes some assumptions with regards to the presence of non-root users and
+groups that don't apply this early into the LFS build. We therefore create
+a dummy system user and two dummy groups to allow the tests to run
+properly. Should you choose not to run the test suite, skip down to
+"Install the package". The following commands will prepare us for the test
+suite. Create two dummy groups and a dummy user name:</para>
+
+<screen><userinput>echo "dummy1:x:1000" >> /etc/group
+echo "dummy2:x:1001:dummy" >> /etc/group
+echo "dummy:x:1000:1000:::/bin/bash" >> /etc/passwd</userinput></screen>
+
+<para>Some tests are meant to run as <emphasis>root</emphasis>:</para>
+
+<screen><userinput>make check-root</userinput></screen>
+
+<para>The remainder of the tests are run as the <emphasis>dummy</emphasis>
+user:</para>
+
+<screen><userinput>su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
+
+<para>Remove the dummy groups and user name:</para>
+
+<screen><userinput>sed -i.bak '/dummy/d' /etc/passwd /etc/group</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And move some programs to their proper locations:</para>
+
+<screen><userinput>mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
+mv /usr/bin/{dir,dircolors,du,date,echo,false,head} /bin
+mv /usr/bin/{install,ln,ls,mkdir,mkfifo,mknod,mv,pwd} /bin
+mv /usr/bin/{rm,rmdir,shred,sync,sleep,stty,su,test} /bin
+mv /usr/bin/{touch,true,uname,vdir} /bin
+mv /usr/bin/chroot /usr/sbin</userinput></screen>
+
+<para>Finally, create a few necessary symlinks:</para>
+
+<screen><userinput>ln -s test /bin/[
+ln -s ../../bin/install /usr/bin</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/diffutils-inst.xml b/chapter06/diffutils-inst.xml
deleted file mode 100644
index fc5805f28..000000000
--- a/chapter06/diffutils-inst.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Diffutils</title>
-
-<para>Prepare Diffutils for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 57c834a41..321081944 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -7,6 +7,25 @@ Estimated required disk space: &diffutils-compsize;</screen>
&aa-diffutils-shortdesc;
&aa-diffutils-dep;
-&c6-diffutils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Diffutils</title>
+
+<para>Prepare Diffutils for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml
deleted file mode 100644
index c5124729d..000000000
--- a/chapter06/e2fsprogs-inst.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of E2fsprogs</title>
-
-<para>It is recommended to build E2fsprogs outside of the
-source tree:</para>
-
-<screen><userinput>mkdir ../e2fsprogs-build
-cd ../e2fsprogs-build</userinput></screen>
-
-<para>Prepare E2fsprogs for compilation:</para>
-
-<screen><userinput>../e2fsprogs-&e2fsprogs-version;/configure --prefix=/usr --with-root-prefix="" \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-elf-shlibs</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--with-root-prefix=""</userinput>: Certain
-programs (such as the e2fsck program) are considered essential programs.
-When, for example, <filename class="directory">/usr</filename> isn't
-mounted, these essential program have to be available. They belong in
-directories like <filename class="directory">/lib</filename> and
-<filename class="directory">/sbin</filename>. If this option isn't passed
-to E2fsprogs's configure, the programs are placed in the
-<filename class="directory">/usr</filename> directory, which is not what we
-want.</para></listitem>
-
-<listitem><para><userinput>--enable-elf-shlibs</userinput>: This creates
-the shared libraries which some programs in this package make use
-of.</para></listitem>
-</itemizedlist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Install most of the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And install also the shared libraries:</para>
-
-<screen><userinput>make install-libs</userinput></screen>
-
-</sect2>
-
-
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 412e99fe6..d9ff51cb9 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -7,6 +7,61 @@ Estimated required disk space: &e2fsprogs-compsize;</screen>
&aa-e2fsprogs-shortdesc;
&aa-e2fsprogs-dep;
-&c6-e2fsprogs-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of E2fsprogs</title>
+
+<para>It is recommended to build E2fsprogs outside of the
+source tree:</para>
+
+<screen><userinput>mkdir ../e2fsprogs-build
+cd ../e2fsprogs-build</userinput></screen>
+
+<para>Prepare E2fsprogs for compilation:</para>
+
+<screen><userinput>../e2fsprogs-&e2fsprogs-version;/configure --prefix=/usr --with-root-prefix="" \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-elf-shlibs</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--with-root-prefix=""</userinput>: Certain
+programs (such as the e2fsck program) are considered essential programs.
+When, for example, <filename class="directory">/usr</filename> isn't
+mounted, these essential program have to be available. They belong in
+directories like <filename class="directory">/lib</filename> and
+<filename class="directory">/sbin</filename>. If this option isn't passed
+to E2fsprogs's configure, the programs are placed in the
+<filename class="directory">/usr</filename> directory, which is not what we
+want.</para></listitem>
+
+<listitem><para><userinput>--enable-elf-shlibs</userinput>: This creates
+the shared libraries which some programs in this package make use
+of.</para></listitem>
+</itemizedlist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Install most of the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And install also the shared libraries:</para>
+
+<screen><userinput>make install-libs</userinput></screen>
+
+</sect2>
+
</sect1>
+
diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml
deleted file mode 100644
index bc0e6cfa9..000000000
--- a/chapter06/ed-inst.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Ed</title>
-
-<note><para>Ed isn't something which many people use. It's installed here
-because it can be used by the patch program if you encounter an ed-based patch
-file. This happens rarely because diff-based patches are preferred these
-days.</para></note>
-
-<para>Ed normally uses the mktemp function to create temporary files in
-<filename class="directory">/tmp</filename>, but this function contains a
-vulnerability (see the section on Temporary Files in <ulink
-url="http://en.tldp.org/HOWTO/Secure-Programs-HOWTO/avoid-race.html"/>). The
-following patch makes Ed use mkstemp instead, which is the recommended way to
-create temporary files.</para>
-
-<para>Apply the patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&ed-patch;</userinput></screen>
-
-<para>Now prepare Ed for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And move the programs to the <filename>/bin</filename> directory, so
-they can be used in the event that the <filename>/usr</filename> partition is
-unavailable.</para>
-
-<screen><userinput>mv /usr/bin/{ed,red} /bin</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/ed.xml b/chapter06/ed.xml
index e5a0c3100..078f0a45a 100644
--- a/chapter06/ed.xml
+++ b/chapter06/ed.xml
@@ -7,8 +7,53 @@ Estimated required disk space: &ed-compsize;</screen>
&aa-ed-shortdesc;
&aa-ed-dep;
-&c6-ed-inst;
-</sect1>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Ed</title>
+
+<note><para>Ed isn't something which many people use. It's installed here
+because it can be used by the patch program if you encounter an ed-based patch
+file. This happens rarely because diff-based patches are preferred these
+days.</para></note>
+
+<para>Ed normally uses the mktemp function to create temporary files in
+<filename class="directory">/tmp</filename>, but this function contains a
+vulnerability (see the section on Temporary Files in <ulink
+url="http://en.tldp.org/HOWTO/Secure-Programs-HOWTO/avoid-race.html"/>). The
+following patch makes Ed use mkstemp instead, which is the recommended way to
+create temporary files.</para>
+
+<para>Apply the patch:</para>
+
+<screen><userinput>patch -Np1 -i ../&ed-patch;</userinput></screen>
+
+<para>Now prepare Ed for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And move the programs to the <filename>/bin</filename> directory, so
+they can be used in the event that the <filename>/usr</filename> partition is
+unavailable.</para>
+
+<screen><userinput>mv /usr/bin/{ed,red} /bin</userinput></screen>
+
+</sect2>
+
+</sect1>
diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml
deleted file mode 100644
index 10d578295..000000000
--- a/chapter06/file-inst.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of File</title>
-
-<para>Prepare File for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/file.xml b/chapter06/file.xml
index db2ada676..d21b96286 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -7,7 +7,25 @@ Estimated required disk space: &file-compsize;</screen>
&aa-file-shortdesc;
&aa-file-dep;
-&c6-file-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of File</title>
+
+<para>Prepare File for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml
deleted file mode 100644
index e2aa65266..000000000
--- a/chapter06/findutils-inst.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installing Findutils</title>
-
-<para>Prepare Findutils for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin</userinput></screen>
-
-<para>By default, the location of the updatedb database is in
-<filename>/usr/var</filename>. To make the location of
-<filename>/var/lib/misc/locatedb</filename> file FHS compliant, pass the
-<emphasis>--localstatedir=/var/lib/misc</emphasis> option to
-<userinput>configure</userinput>.</para>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 6918deb5e..5d527b2ee 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -7,7 +7,37 @@ Estimated required disk space: &findutils-compsize;</screen>
&aa-findutils-shortdesc;
&aa-findutils-dep;
-&c6-findutils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installing Findutils</title>
+
+<para>Prepare Findutils for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/bin</userinput></screen>
+
+<para>By default, the location of the updatedb database is in
+<filename>/usr/var</filename>. To make the location of
+<filename>/var/lib/misc/locatedb</filename> file FHS compliant, pass the
+<emphasis>--localstatedir=/var/lib/misc</emphasis> option to
+<userinput>configure</userinput>.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/flex-inst.xml b/chapter06/flex-inst.xml
deleted file mode 100644
index 2681eb7ce..000000000
--- a/chapter06/flex-inst.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Flex</title>
-
-<para>Prepare Flex for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make bigcheck</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>There are some packages that expect to find the Lex library in
-<filename>/usr/lib</filename>. Create a symlink to account for this:</para>
-
-<screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
-
-<para>A few programs don't know about <userinput>flex</userinput> yet and try
-to run its predecessor <userinput>lex</userinput>. To support those programs,
-create a shell script named <filename>lex</filename> that calls
-<userinput>flex</userinput> in Lex emulation mode:</para>
-
-<screen><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"</userinput>
-#!/bin/sh
-# Begin /usr/bin/lex
-
-exec /usr/bin/flex -l "$@"
-
-# End /usr/bin/lex
-<userinput>EOF
-chmod 755 /usr/bin/lex</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index bf7ddd59f..d202df991 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -7,6 +7,51 @@ Estimated required disk space: &flex-compsize;</screen>
&aa-flex-shortdesc;
&aa-flex-dep;
-&c6-flex-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Flex</title>
+
+<para>Prepare Flex for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make bigcheck</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>There are some packages that expect to find the Lex library in
+<filename>/usr/lib</filename>. Create a symlink to account for this:</para>
+
+<screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
+
+<para>A few programs don't know about <userinput>flex</userinput> yet and try
+to run its predecessor <userinput>lex</userinput>. To support those programs,
+create a shell script named <filename>lex</filename> that calls
+<userinput>flex</userinput> in Lex emulation mode:</para>
+
+<screen><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin /usr/bin/lex
+
+exec /usr/bin/flex -l "$@"
+
+# End /usr/bin/lex
+<userinput>EOF
+chmod 755 /usr/bin/lex</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml
deleted file mode 100644
index d5b5dd9d7..000000000
--- a/chapter06/gawk-inst.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<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/bin</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/bin</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 15d58ccf9..e1989f21c 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -7,7 +7,57 @@ Estimated required disk space: &gawk-compsize;</screen>
&aa-gawk-shortdesc;
&aa-gawk-dep;
-&c6-gawk-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<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/bin</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/bin</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/gcc-2953-inst.xml b/chapter06/gcc-2953-inst.xml
deleted file mode 100644
index 782f708bc..000000000
--- a/chapter06/gcc-2953-inst.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of GCC</title>
-
-<para>This package is known to behave badly when you have changed its
-default optimization flags (including the -march and -mcpu options).
-Therefore, if you have defined any environment variables that override
-default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
-or modifying them when building GCC.</para>
-
-<para>This is an older release of GCC which we are going to install for the
-purpose of compiling the Linux kernel in <xref linkend="chapter08"/>. This
-version is recommended
-by the kernel developers when you need absolute stability. Later versions of
-GCC have not received as much testing for Linux kernel compilation. Using a
-later version is likely to work, however, we recommend adhering to the kernel
-developer's advice and using the version here to compile your kernel.</para>
-
-<note><para>We don't install the C++ compiler or libraries here. However, there
-may be reasons why you would want to install them. More information can be found
-at <ulink url="&blfs-root;view/stable/general/gcc2.html"/>.</para></note>
-
-<para>We'll install this older release of GCC into the non-standard prefix of
-<filename class="directory">/opt</filename> so as to avoid interfering with
-the system GCC already installed in <filename class="directory">/usr</filename>
- .</para>
-
-<para>Apply the patches and make a small adjustment:</para>
-
-<screen><userinput>patch -Np1 -i ../&gcc-2953-patch;
-patch -Np1 -i ../&gcc-2953-no-fixinc-patch;
-patch -Np1 -i ../&gcc-2953-returntype-fix-patch;
-echo timestamp &gt; gcc/cstamp-h.in</userinput></screen>
-
-<para>The GCC documentation recommends building GCC outside of the source
-directory in a dedicated build directory:</para>
-
-<screen><userinput>mkdir ../gcc-2-build
-cd ../gcc-2-build</userinput></screen>
-
-<para>Compile and install gcc:</para>
-
-<screen><userinput>../gcc-2.95.3/configure --prefix=/opt/gcc-2.95.3 \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-languages=c \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix
-make bootstrap
-make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/gcc-2953.xml b/chapter06/gcc-2953.xml
index 0afac9ae7..f0f196ada 100644
--- a/chapter06/gcc-2953.xml
+++ b/chapter06/gcc-2953.xml
@@ -5,7 +5,57 @@
<screen>Estimated build time: &gcc-2953-time;
Estimated required disk space: &gcc-2953-compsize;</screen>
-&c6-gcc-2953-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of GCC</title>
+
+<para>This package is known to behave badly when you have changed its
+default optimization flags (including the -march and -mcpu options).
+Therefore, if you have defined any environment variables that override
+default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
+or modifying them when building GCC.</para>
+
+<para>This is an older release of GCC which we are going to install for the
+purpose of compiling the Linux kernel in <xref linkend="chapter08"/>. This
+version is recommended
+by the kernel developers when you need absolute stability. Later versions of
+GCC have not received as much testing for Linux kernel compilation. Using a
+later version is likely to work, however, we recommend adhering to the kernel
+developer's advice and using the version here to compile your kernel.</para>
+
+<note><para>We don't install the C++ compiler or libraries here. However, there
+may be reasons why you would want to install them. More information can be found
+at <ulink url="&blfs-root;view/stable/general/gcc2.html"/>.</para></note>
+
+<para>We'll install this older release of GCC into the non-standard prefix of
+<filename class="directory">/opt</filename> so as to avoid interfering with
+the system GCC already installed in <filename class="directory">/usr</filename>
+ .</para>
+
+<para>Apply the patches and make a small adjustment:</para>
+
+<screen><userinput>patch -Np1 -i ../&gcc-2953-patch;
+patch -Np1 -i ../&gcc-2953-no-fixinc-patch;
+patch -Np1 -i ../&gcc-2953-returntype-fix-patch;
+echo timestamp &gt; gcc/cstamp-h.in</userinput></screen>
+
+<para>The GCC documentation recommends building GCC outside of the source
+directory in a dedicated build directory:</para>
+
+<screen><userinput>mkdir ../gcc-2-build
+cd ../gcc-2-build</userinput></screen>
+
+<para>Compile and install gcc:</para>
+
+<screen><userinput>../gcc-2.95.3/configure --prefix=/opt/gcc-2.95.3 \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-languages=c \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix
+make bootstrap
+make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
deleted file mode 100644
index 835df60b6..000000000
--- a/chapter06/gcc-inst.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of GCC</title>
-
-<note><para>The test suite for GCC in this section is considered
-<emphasis>critical</emphasis>. Our advice is to not skip it under any
-circumstance.</para></note>
-
-<para>This package is known to behave badly when you have changed its
-default optimization flags (including the -march and -mcpu options).
-Therefore, if you have defined any environment variables that override
-default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
-or modifying them when building GCC.</para>
-
-<para>This time we will build both the C and the C++ compiler, so you'll have
-to unpack the GCC-core <emphasis>and</emphasis> the GCC-g++ tarball -- they
-will unfold into the same directory. You should likewise extract the
-GCC-testsuite package. The full GCC package contains even more
-compilers. Instructions for building these can be found at
-<ulink url="&blfs-root;view/stable/general/gcc.html"/>.</para>
-
-<screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;
-patch -Np1 -i ../&gcc-suppress-libiberty-patch;</userinput></screen>
-
-<para>The second patch here suppresses the installation of libiberty from GCC,
-as we will use the one provided by binutils instead. Be careful
-<emphasis>not</emphasis> to apply the GCC specs patch from Chapter 5
-here.</para>
-
-<para>The GCC documentation recommends building GCC outside of the source
-directory in a dedicated build directory:</para>
-
-<screen><userinput>mkdir ../gcc-build
-cd ../gcc-build</userinput></screen>
-
-<para>Now prepare GCC for compilation:</para>
-
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-threads=posix \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-__cxa_atexit --enable-clocale=gnu \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Test the results, but don't stop at errors (you'll remember the few
-known ones):</para>
-
-<screen><userinput>make -k check</userinput></screen>
-
-<para>The test suite notes from <xref linkend="ch05-gcc-pass2"/> are still very
-much appropriate here. Be sure to refer back there should you have any
-doubts.</para>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Some packages expect the C PreProcessor to be installed in the
-<filename>/lib</filename> directory.
-To honor those packages, create this symlink:</para>
-
-<screen><userinput>ln -s ../usr/bin/cpp /lib</userinput></screen>
-
-<para>Many packages use the name <userinput>cc</userinput> to call the C
-compiler. To satisfy those packages, create a symlink:</para>
-
-<screen><userinput>ln -s gcc /usr/bin/cc</userinput></screen>
-
-<note><para>At this point it is strongly recommended to repeat the sanity check
-we performed earlier in this chapter. Refer back to
-<xref linkend="ch06-adjustingtoolchain"/> and repeat the check. If the results
-are wrong, then most likely you erroneously applied the GCC Specs patch from
-Chapter 5.</para></note>
-
-</sect2>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index dd141c817..54a105db1 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -7,7 +7,85 @@ Estimated required disk space: &gcc-compsize;</screen>
&aa-gcc-shortdesc;
&aa-gcc-dep;
-&c6-gcc-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of GCC</title>
+
+<note><para>The test suite for GCC in this section is considered
+<emphasis>critical</emphasis>. Our advice is to not skip it under any
+circumstance.</para></note>
+
+<para>This package is known to behave badly when you have changed its
+default optimization flags (including the -march and -mcpu options).
+Therefore, if you have defined any environment variables that override
+default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
+or modifying them when building GCC.</para>
+
+<para>This time we will build both the C and the C++ compiler, so you'll have
+to unpack the GCC-core <emphasis>and</emphasis> the GCC-g++ tarball -- they
+will unfold into the same directory. You should likewise extract the
+GCC-testsuite package. The full GCC package contains even more
+compilers. Instructions for building these can be found at
+<ulink url="&blfs-root;view/stable/general/gcc.html"/>.</para>
+
+<screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;
+patch -Np1 -i ../&gcc-suppress-libiberty-patch;</userinput></screen>
+
+<para>The second patch here suppresses the installation of libiberty from GCC,
+as we will use the one provided by binutils instead. Be careful
+<emphasis>not</emphasis> to apply the GCC specs patch from Chapter 5
+here.</para>
+
+<para>The GCC documentation recommends building GCC outside of the source
+directory in a dedicated build directory:</para>
+
+<screen><userinput>mkdir ../gcc-build
+cd ../gcc-build</userinput></screen>
+
+<para>Now prepare GCC for compilation:</para>
+
+<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-threads=posix \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-__cxa_atexit --enable-clocale=gnu \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Test the results, but don't stop at errors (you'll remember the few
+known ones):</para>
+
+<screen><userinput>make -k check</userinput></screen>
+
+<para>The test suite notes from <xref linkend="ch05-gcc-pass2"/> are still very
+much appropriate here. Be sure to refer back there should you have any
+doubts.</para>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Some packages expect the C PreProcessor to be installed in the
+<filename>/lib</filename> directory.
+To honor those packages, create this symlink:</para>
+
+<screen><userinput>ln -s ../usr/bin/cpp /lib</userinput></screen>
+
+<para>Many packages use the name <userinput>cc</userinput> to call the C
+compiler. To satisfy those packages, create a symlink:</para>
+
+<screen><userinput>ln -s gcc /usr/bin/cc</userinput></screen>
+
+<note><para>At this point it is strongly recommended to repeat the sanity check
+we performed earlier in this chapter. Refer back to
+<xref linkend="ch06-adjustingtoolchain"/> and repeat the check. If the results
+are wrong, then most likely you erroneously applied the GCC Specs patch from
+Chapter 5.</para></note>
+
+</sect2>
</sect1>
diff --git a/chapter06/gettext-inst.xml b/chapter06/gettext-inst.xml
deleted file mode 100644
index 47c1fcc1c..000000000
--- a/chapter06/gettext-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Gettext</title>
-
-<para>Prepare Gettext for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so (and takes a very long time):</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index 1c240346d..63d473121 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -7,6 +7,31 @@ Estimated required disk space: &gettext-compsize;</screen>
&aa-gettext-shortdesc;
&aa-gettext-dep;
-&c6-gettext-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Gettext</title>
+
+<para>Prepare Gettext for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so (and takes a very long time):</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
deleted file mode 100644
index a10cc9347..000000000
--- a/chapter06/glibc-inst.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Glibc installation</title>
-
-<para>The Glibc build system is very well self-contained and will install
-perfectly, even though our compiler specs file and linker are still pointing
-at <filename>/tools</filename>. We cannot adjust the specs and linker before
-the Glibc install, because the Glibc autoconf tests would then give bogus
-results and thus defeat our goal of achieving a clean build.</para>
-
-<note><para>The test suite for Glibc in this section is considered
-<emphasis>critical</emphasis>. Our advice is to not skip it under any
-circumstance.</para></note>
-
-<para>Before starting to build Glibc, remember to unpack the Glibc-linuxthreads
-again inside the <filename>glibc-&glibc-version;</filename> directory, and to
-unset any environment variables that override the default optimization
-flags.</para>
-
-<para>Though it is a harmless message, the install stage of Glibc will
-complain about the absence of <filename>/etc/ld.so.conf</filename>. Fix this
-annoying little warning with:</para>
-
-<screen><userinput>touch /etc/ld.so.conf</userinput></screen>
-
-<para>Then apply the same patch we used previously:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-sscanf-patch;</userinput></screen>
-
-<para>The Glibc documentation recommends building Glibc outside of the source
-directory in a dedicated build directory:</para>
-
-<screen><userinput>mkdir ../glibc-build
-cd ../glibc-build</userinput></screen>
-
-<para>Now prepare Glibc for compilation:</para>
-
-<screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-profile --enable-add-ons \
-&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin --with-headers=/usr/include</userinput></screen>
-
-<para>The meaning of the new configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--libexecdir=/usr/bin</userinput>: This will
-cause the <filename>pt_chown</filename> program to be installed in the
-<filename>/usr/bin</filename> directory.</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
-<filename>/tools/include</filename> are used which of course is not ideal
-(although they should be identical). Using this switch has the advantage
-that you will be informed immediately should you have forgotten to install the
-kernel headers into <filename>/usr/include</filename>.</para></listitem>
-</itemizedlist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Test the results:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>The test suite notes from <xref linkend="ch05-glibc"/> are still very much
-appropriate here. Be sure to refer back there should you have any doubts.</para>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>The locales that can make your system respond in a different language
-weren't installed by the above command. Do it with this:</para>
-
-<screen><userinput>make localedata/install-locales</userinput></screen>
-
-<para>An alternative to running the previous command is to install only those
-locales which you need or want. This can be achieved using the
-<userinput>localedef</userinput> command. Information on this can be found in
-the <filename>INSTALL</filename> file in the
-<filename>glibc-&glibc-version;</filename> tree. However, there are a number
-of locales that are essential for the tests of future packages to pass
-correctly. The following instructions, in place of the install-locales
-command above, will install the minimum set of locales necessary for the
-tests to run successfully:</para>
-
-<screen><userinput>mkdir -p /usr/lib/locale
-localedef -i de_DE -f ISO-8859-1 de_DE
-localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
-localedef -i en_HK -f ISO-8859-1 en_HK
-localedef -i en_PH -f ISO-8859-1 en_PH
-localedef -i en_US -f ISO-8859-1 en_US
-localedef -i es_MX -f ISO-8859-1 es_MX
-localedef -i fr_FR -f ISO-8859-1 fr_FR
-localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
-localedef -i it_IT -f ISO-8859-1 it_IT
-localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
-
-<para>Finally, build the linuxthreads man pages:</para>
-
-<screen><userinput>make -C ../&glibc-dir;/linuxthreads/man</userinput></screen>
-
-<para>And install these pages:</para>
-
-<screen><userinput>make -C ../&glibc-dir;/linuxthreads/man install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 5567defe8..0ee7f3f5b 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -7,8 +7,116 @@ Estimated required disk space: &glibc-compsize;</screen>
&aa-glibc-shortdesc;
&aa-glibc-dep;
-&c6-glibc-inst;
-&c6-cf-glibc;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Glibc installation</title>
+
+<para>The Glibc build system is very well self-contained and will install
+perfectly, even though our compiler specs file and linker are still pointing
+at <filename>/tools</filename>. We cannot adjust the specs and linker before
+the Glibc install, because the Glibc autoconf tests would then give bogus
+results and thus defeat our goal of achieving a clean build.</para>
+
+<note><para>The test suite for Glibc in this section is considered
+<emphasis>critical</emphasis>. Our advice is to not skip it under any
+circumstance.</para></note>
+
+<para>Before starting to build Glibc, remember to unpack the Glibc-linuxthreads
+again inside the <filename>glibc-&glibc-version;</filename> directory, and to
+unset any environment variables that override the default optimization
+flags.</para>
+
+<para>Though it is a harmless message, the install stage of Glibc will
+complain about the absence of <filename>/etc/ld.so.conf</filename>. Fix this
+annoying little warning with:</para>
+
+<screen><userinput>touch /etc/ld.so.conf</userinput></screen>
+
+<para>Then apply the same patch we used previously:</para>
+
+<screen><userinput>patch -Np1 -i ../&glibc-sscanf-patch;</userinput></screen>
+
+<para>The Glibc documentation recommends building Glibc outside of the source
+directory in a dedicated build directory:</para>
+
+<screen><userinput>mkdir ../glibc-build
+cd ../glibc-build</userinput></screen>
+
+<para>Now prepare Glibc for compilation:</para>
+
+<screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-profile --enable-add-ons \
+&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin --with-headers=/usr/include</userinput></screen>
+
+<para>The meaning of the new configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--libexecdir=/usr/bin</userinput>: This will
+cause the <filename>pt_chown</filename> program to be installed in the
+<filename>/usr/bin</filename> directory.</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
+<filename>/tools/include</filename> are used which of course is not ideal
+(although they should be identical). Using this switch has the advantage
+that you will be informed immediately should you have forgotten to install the
+kernel headers into <filename>/usr/include</filename>.</para></listitem>
+</itemizedlist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Test the results:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>The test suite notes from <xref linkend="ch05-glibc"/> are still very much
+appropriate here. Be sure to refer back there should you have any doubts.</para>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>The locales that can make your system respond in a different language
+weren't installed by the above command. Do it with this:</para>
+
+<screen><userinput>make localedata/install-locales</userinput></screen>
+
+<para>An alternative to running the previous command is to install only those
+locales which you need or want. This can be achieved using the
+<userinput>localedef</userinput> command. Information on this can be found in
+the <filename>INSTALL</filename> file in the
+<filename>glibc-&glibc-version;</filename> tree. However, there are a number
+of locales that are essential for the tests of future packages to pass
+correctly. The following instructions, in place of the install-locales
+command above, will install the minimum set of locales necessary for the
+tests to run successfully:</para>
+
+<screen><userinput>mkdir -p /usr/lib/locale
+localedef -i de_DE -f ISO-8859-1 de_DE
+localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
+localedef -i en_HK -f ISO-8859-1 en_HK
+localedef -i en_PH -f ISO-8859-1 en_PH
+localedef -i en_US -f ISO-8859-1 en_US
+localedef -i es_MX -f ISO-8859-1 es_MX
+localedef -i fr_FR -f ISO-8859-1 fr_FR
+localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
+localedef -i it_IT -f ISO-8859-1 it_IT
+localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
+
+<para>Finally, build the linuxthreads man pages:</para>
+
+<screen><userinput>make -C ../&glibc-dir;/linuxthreads/man</userinput></screen>
+
+<para>And install these pages:</para>
+
+<screen><userinput>make -C ../&glibc-dir;/linuxthreads/man install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/grep-inst.xml b/chapter06/grep-inst.xml
deleted file mode 100644
index 5957f5e99..000000000
--- a/chapter06/grep-inst.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Grep</title>
-
-<para>Prepare Grep for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --bindir=/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-included-regex</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index d764ecd27..a68e7a271 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -7,6 +7,32 @@ Estimated required disk space: &grep-compsize;</screen>
&aa-grep-shortdesc;
&aa-grep-dep;
-&c6-grep-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Grep</title>
+
+<para>Prepare Grep for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --bindir=/bin \
+&nbsp;&nbsp;&nbsp;&nbsp;--with-included-regex</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml
deleted file mode 100644
index 7b2afb1a3..000000000
--- a/chapter06/groff-inst.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Groff</title>
-
-<para>Groff expects the environment variable PAGE to contain the default paper
-size. For those in the United States, the command below is appropriate. If you
-live elsewhere, you may want to change <emphasis>PAGE=letter</emphasis> to
-<emphasis>PAGE=A4</emphasis>.</para>
-
-<para>Prepare Groff for compilation:</para>
-
-<screen><userinput>PAGE=letter ./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Some documentation programs, such as <userinput>xman</userinput>,
-will not work work properly without the following symlinks:</para>
-
-<screen><userinput>ln -s soelim /usr/bin/zsoelim
-ln -s eqn /usr/bin/geqn
-ln -s tbl /usr/bin/gtbl</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 6699b0c81..4c3531fd9 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -7,7 +7,37 @@ Estimated required disk space: &groff-compsize;</screen>
&aa-groff-shortdesc;
&aa-groff-dep;
-&c6-groff-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Groff</title>
+
+<para>Groff expects the environment variable PAGE to contain the default paper
+size. For those in the United States, the command below is appropriate. If you
+live elsewhere, you may want to change <emphasis>PAGE=letter</emphasis> to
+<emphasis>PAGE=A4</emphasis>.</para>
+
+<para>Prepare Groff for compilation:</para>
+
+<screen><userinput>PAGE=letter ./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Some documentation programs, such as <userinput>xman</userinput>,
+will not work work properly without the following symlinks:</para>
+
+<screen><userinput>ln -s soelim /usr/bin/zsoelim
+ln -s eqn /usr/bin/geqn
+ln -s tbl /usr/bin/gtbl</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml
deleted file mode 100644
index 748de1fbc..000000000
--- a/chapter06/grub-inst.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Grub</title>
-
-<para>This package is known to behave badly when you have changed its default
-optimization flags (including the -march and -mcpu options). Therefore, if you
-have defined any environment variables that override default optimizations,
-such as CFLAGS and CXXFLAGS, we recommend unsetting them when building
-Grub.</para>
-
-<para>Grub needs a patch to fix a compilation problem with GCC-&gcc-version;</para>
-
-<screen><userinput>patch -Np1 -i ../&grub-patch;</userinput></screen>
-
-<para>Prepare Grub for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install
-mkdir /boot/grub
-cp /usr/share/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen>
-
-<para>Replace <filename class="directory">i386-pc</filename> with whatever
-directory is appropriate for your hardware.</para>
-
-<para>The <filename class="directory">i386-pc</filename> directory also
-contains a number of <filename>*stage1_5</filename> files, different ones
-for different filesystems. Have a look at the ones available and copy the
-appropriate ones to the <filename class="directory">/boot/grub</filename>
-directory. Most people will copy the <filename>e2fs_stage1_5</filename>
-and/or <filename>reiserfs_stage1_5</filename> files.</para>
-
-</sect2>
-
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 1eadcb226..431715f8d 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -7,6 +7,47 @@ Estimated required disk space: &grub-compsize;</screen>
&aa-grub-shortdesc;
&aa-grub-dep;
-&c6-grub-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Grub</title>
+
+<para>This package is known to behave badly when you have changed its default
+optimization flags (including the -march and -mcpu options). Therefore, if you
+have defined any environment variables that override default optimizations,
+such as CFLAGS and CXXFLAGS, we recommend unsetting them when building
+Grub.</para>
+
+<para>Grub needs a patch to fix a compilation problem with GCC-&gcc-version;</para>
+
+<screen><userinput>patch -Np1 -i ../&grub-patch;</userinput></screen>
+
+<para>Prepare Grub for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install
+mkdir /boot/grub
+cp /usr/share/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen>
+
+<para>Replace <filename class="directory">i386-pc</filename> with whatever
+directory is appropriate for your hardware.</para>
+
+<para>The <filename class="directory">i386-pc</filename> directory also
+contains a number of <filename>*stage1_5</filename> files, different ones
+for different filesystems. Have a look at the ones available and copy the
+appropriate ones to the <filename class="directory">/boot/grub</filename>
+directory. Most people will copy the <filename>e2fs_stage1_5</filename>
+and/or <filename>reiserfs_stage1_5</filename> files.</para>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml
deleted file mode 100644
index 55ace4eeb..000000000
--- a/chapter06/gzip-inst.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Gzip</title>
-
-<para>Prepare Gzip for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>The gzexe program has the location of the gzip binary hard-wired into
-it. Because we later change the location of this binary, the following
-command will place the new location into the gzexe binary.</para>
-
-<screen><userinput>cp gzexe.in{,.backup}
-sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And move the programs to the <filename
-class="directory">/bin</filename> directory:</para>
-
-<screen><userinput>mv /usr/bin/gzip /bin
-rm /usr/bin/{gunzip,zcat}
-ln -s gzip /bin/gunzip
-ln -s gzip /bin/zcat
-ln -s gunzip /bin/uncompress</userinput></screen>
-
-</sect2>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 616614f1f..c5a65e9b0 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -7,6 +7,41 @@ Estimated required disk space: &gzip-compsize;</screen>
&aa-gzip-shortdesc;
&aa-gzip-dep;
-&c6-gzip-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Gzip</title>
+
+<para>Prepare Gzip for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>The gzexe program has the location of the gzip binary hard-wired into
+it. Because we later change the location of this binary, the following
+command will place the new location into the gzexe binary.</para>
+
+<screen><userinput>cp gzexe.in{,.backup}
+sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And move the programs to the <filename
+class="directory">/bin</filename> directory:</para>
+
+<screen><userinput>mv /usr/bin/gzip /bin
+rm /usr/bin/{gunzip,zcat}
+ln -s gzip /bin/gunzip
+ln -s gzip /bin/zcat
+ln -s gunzip /bin/uncompress</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/inetutils-inst.xml b/chapter06/inetutils-inst.xml
deleted file mode 100644
index 0b08d6d34..000000000
--- a/chapter06/inetutils-inst.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Inetutils</title>
-
-<para>Prepare Inetutils for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --disable-syslogd \
-&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/sbin --disable-logger \
-&nbsp;&nbsp;&nbsp;&nbsp;--sysconfdir=/etc --localstatedir=/var \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-whois --disable-servers</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--disable-syslogd</userinput>: This option
-prevents inetutils from installing the System Log Daemon, which is
-installed with the Sysklogd package.</para></listitem>
-
-<listitem><para><userinput>--disable-logger</userinput>: This option
-prevents inetutils from installing the logger program, which is used by
-scripts to pass messages to the System Log Daemon. We do not install it
-because Util-linux installs a better version later.</para></listitem>
-
-<listitem><para><userinput>--disable-whois</userinput>: This option disables
-the building of the inetutils whois client, which is woefully out of date.
-Instructions for a better whois client are in the BLFS book.</para></listitem>
-
-<listitem><para><userinput>--disable-servers</userinput>: This disables the
-installation of the various network servers included as part of the Inetutils
-package. These servers are deemed not appropriate in a basic LFS system. Some
-are insecure by nature and are only considered safe on trusted networks. More
-information can be found at
-<ulink url="&blfs-root;view/stable/basicnet/inetutils.html"/>. Note that better
-replacements are available for many of these servers.</para></listitem>
-</itemizedlist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And move the <userinput>ping</userinput> program to its proper place:</para>
-
-<screen><userinput>mv /usr/bin/ping /bin</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index b269ec090..fd448abdb 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -7,6 +7,57 @@ Estimated required disk space: &inetutils-compsize;</screen>
&aa-inetutils-shortdesc;
&aa-inetutils-dep;
-&c6-inetutils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Inetutils</title>
+
+<para>Prepare Inetutils for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --disable-syslogd \
+&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/sbin --disable-logger \
+&nbsp;&nbsp;&nbsp;&nbsp;--sysconfdir=/etc --localstatedir=/var \
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-whois --disable-servers</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--disable-syslogd</userinput>: This option
+prevents inetutils from installing the System Log Daemon, which is
+installed with the Sysklogd package.</para></listitem>
+
+<listitem><para><userinput>--disable-logger</userinput>: This option
+prevents inetutils from installing the logger program, which is used by
+scripts to pass messages to the System Log Daemon. We do not install it
+because Util-linux installs a better version later.</para></listitem>
+
+<listitem><para><userinput>--disable-whois</userinput>: This option disables
+the building of the inetutils whois client, which is woefully out of date.
+Instructions for a better whois client are in the BLFS book.</para></listitem>
+
+<listitem><para><userinput>--disable-servers</userinput>: This disables the
+installation of the various network servers included as part of the Inetutils
+package. These servers are deemed not appropriate in a basic LFS system. Some
+are insecure by nature and are only considered safe on trusted networks. More
+information can be found at
+<ulink url="&blfs-root;view/stable/basicnet/inetutils.html"/>. Note that better
+replacements are available for many of these servers.</para></listitem>
+</itemizedlist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And move the <userinput>ping</userinput> program to its proper place:</para>
+
+<screen><userinput>mv /usr/bin/ping /bin</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml
deleted file mode 100644
index 39f9b5cb4..000000000
--- a/chapter06/kbd-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Kbd</title>
-
-<para>By default some of Kbd's utilities (<userinput>setlogcons</userinput>,
-<userinput>setvesablank</userinput> and <userinput>getunimap</userinput>) are
-not installed . The patch enables the compilation of these utilities:</para>
-
-<screen><userinput>patch -Np1 -i ../&kbd-patch;</userinput></screen>
-
-<para>Now prepare Kbd for compilation:</para>
-
-<screen><userinput>./configure</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 5e9fc3830..33eb1d71c 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -7,7 +7,31 @@ Estimated required disk space: &kbd-compsize;</screen>
&aa-kbd-shortdesc;
&aa-kbd-dep;
-&c6-kbd-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Kbd</title>
+
+<para>By default some of Kbd's utilities (<userinput>setlogcons</userinput>,
+<userinput>setvesablank</userinput> and <userinput>getunimap</userinput>) are
+not installed . The patch enables the compilation of these utilities:</para>
+
+<screen><userinput>patch -Np1 -i ../&kbd-patch;</userinput></screen>
+
+<para>Now prepare Kbd for compilation:</para>
+
+<screen><userinput>./configure</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/kernel-inst.xml b/chapter06/kernel-inst.xml
deleted file mode 100644
index b3b6f41cd..000000000
--- a/chapter06/kernel-inst.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of the kernel headers</title>
-
-<para>We won't be compiling a new kernel yet -- we'll do that when we have
-finished the installation of all the packages. But as some packages need the
-kernel header files, we're going to unpack the kernel archive now, set it up
-and copy the header files so they can be found by these packages.</para>
-
-<para>It is important to note that the files in the kernel source directory
-are not owned by <emphasis>root</emphasis>. Whenever you unpack a package as
-user <emphasis>root</emphasis> (like we do here inside chroot), the files end
-up having the user and group IDs of whatever they were on the packager's
-computer. This is usually not a
-problem for any other package you install because you remove the source
-tree after the installation. But the Linux kernel source tree is often kept
-around for a long time, so there's a chance that whatever user ID the packager
-used will be assigned to somebody on your machine and then that person would
-have write access to the kernel source.</para>
-
-<para>In light of this, you might want to run <userinput>chown -R 0:0</userinput>
-on the <filename>linux-&kernel-version;</filename> directory
-to ensure all files are owned by user <emphasis>root</emphasis>.</para>
-
-<para>Prepare for header installation:</para>
-
-<screen><userinput>make mrproper</userinput></screen>
-
-<para>This ensures that the kernel tree is absolutely clean. The kernel team
-recommends that this command be issued prior to <emphasis>each</emphasis> kernel
-compilation. You shouldn't rely on the source tree being clean after
-untarring.</para>
-
-<para>Create the <filename>include/linux/version.h</filename> file:</para>
-
-<screen><userinput>make include/linux/version.h</userinput></screen>
-
-<para>Create the platform-specific <filename>include/asm</filename>
-symlink:</para>
-
-<screen><userinput>make symlinks</userinput></screen>
-
-<para>Install the platform specific-header files:</para>
-
-<screen><userinput>cp -HR include/asm /usr/include
-cp -R include/asm-generic /usr/include</userinput></screen>
-
-<para>Install the cross-platform kernel header files:</para>
-
-<screen><userinput>cp -R include/linux /usr/include</userinput></screen>
-
-<para>There are a few kernel header files which make use of the
-<filename>autoconf.h</filename> header file. Since we do not yet configure the
-kernel, we need to create this file ourselves in order to avoid compilation
-failures. Create an empty <filename>autoconf.h</filename> file:</para>
-
-<screen><userinput>touch /usr/include/linux/autoconf.h</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index f16c107ad..f154f00c5 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -7,8 +7,67 @@ Estimated required disk space: &kernel-compsize-headers;</screen>
&aa-kernel-shortdesc;
&aa-kernel-dep;
-&c6-kernel-inst;
-&c6-kernel-exp-headers;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of the kernel headers</title>
+
+<para>We won't be compiling a new kernel yet -- we'll do that when we have
+finished the installation of all the packages. But as some packages need the
+kernel header files, we're going to unpack the kernel archive now, set it up
+and copy the header files so they can be found by these packages.</para>
+
+<para>It is important to note that the files in the kernel source directory
+are not owned by <emphasis>root</emphasis>. Whenever you unpack a package as
+user <emphasis>root</emphasis> (like we do here inside chroot), the files end
+up having the user and group IDs of whatever they were on the packager's
+computer. This is usually not a
+problem for any other package you install because you remove the source
+tree after the installation. But the Linux kernel source tree is often kept
+around for a long time, so there's a chance that whatever user ID the packager
+used will be assigned to somebody on your machine and then that person would
+have write access to the kernel source.</para>
+
+<para>In light of this, you might want to run <userinput>chown -R 0:0</userinput>
+on the <filename>linux-&kernel-version;</filename> directory
+to ensure all files are owned by user <emphasis>root</emphasis>.</para>
+
+<para>Prepare for header installation:</para>
+
+<screen><userinput>make mrproper</userinput></screen>
+
+<para>This ensures that the kernel tree is absolutely clean. The kernel team
+recommends that this command be issued prior to <emphasis>each</emphasis> kernel
+compilation. You shouldn't rely on the source tree being clean after
+untarring.</para>
+
+<para>Create the <filename>include/linux/version.h</filename> file:</para>
+
+<screen><userinput>make include/linux/version.h</userinput></screen>
+
+<para>Create the platform-specific <filename>include/asm</filename>
+symlink:</para>
+
+<screen><userinput>make symlinks</userinput></screen>
+
+<para>Install the platform specific-header files:</para>
+
+<screen><userinput>cp -HR include/asm /usr/include
+cp -R include/asm-generic /usr/include</userinput></screen>
+
+<para>Install the cross-platform kernel header files:</para>
+
+<screen><userinput>cp -R include/linux /usr/include</userinput></screen>
+
+<para>There are a few kernel header files which make use of the
+<filename>autoconf.h</filename> header file. Since we do not yet configure the
+kernel, we need to create this file ourselves in order to avoid compilation
+failures. Create an empty <filename>autoconf.h</filename> file:</para>
+
+<screen><userinput>touch /usr/include/linux/autoconf.h</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/less-inst.xml b/chapter06/less-inst.xml
deleted file mode 100644
index 13e23a1a2..000000000
--- a/chapter06/less-inst.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Less</title>
-
-<para>Prepare Less for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --bindir=/bin --sysconfdir=/etc</userinput></screen>
-
-<para>The meaning of the configure option:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--sysconfdir=/etc</userinput>: This option tells the
-programs created by the package to look in <filename>/etc</filename> for their
-configuration files.</para></listitem>
-</itemizedlist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/less.xml b/chapter06/less.xml
index e65ad3072..0508af478 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -7,7 +7,33 @@ Estimated required disk space: &less-compsize;</screen>
&aa-less-shortdesc;
&aa-less-dep;
-&c6-less-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Less</title>
+
+<para>Prepare Less for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --bindir=/bin --sysconfdir=/etc</userinput></screen>
+
+<para>The meaning of the configure option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--sysconfdir=/etc</userinput>: This option tells the
+programs created by the package to look in <filename>/etc</filename> for their
+configuration files.</para></listitem>
+</itemizedlist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/lfs-utils-inst.xml b/chapter06/lfs-utils-inst.xml
deleted file mode 100644
index 2961ec330..000000000
--- a/chapter06/lfs-utils-inst.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Lfs-Utils</title>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Now copy two supporting files included in the Lfs-Utils tarball to
-their destination:</para>
-
-<screen><userinput>cp etc/{services,protocols} /etc</userinput></screen>
-
-<para>The <filename>/etc/services</filename> file is used to resolve service
-numbers to human-readable names, and the <filename>/etc/protocols</filename>
-does the same for protocol numbers.</para>
-
-</sect2>
-
diff --git a/chapter06/lfs-utils.xml b/chapter06/lfs-utils.xml
index 1436e58f5..5119b4804 100644
--- a/chapter06/lfs-utils.xml
+++ b/chapter06/lfs-utils.xml
@@ -7,6 +7,30 @@ Estimated required disk space: &lfs-utils-compsize;</screen>
&aa-lfs-utils-shortdesc;
&aa-lfs-utils-dep;
-&c6-lfs-utils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Lfs-Utils</title>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Now copy two supporting files included in the Lfs-Utils tarball to
+their destination:</para>
+
+<screen><userinput>cp etc/{services,protocols} /etc</userinput></screen>
+
+<para>The <filename>/etc/services</filename> file is used to resolve service
+numbers to human-readable names, and the <filename>/etc/protocols</filename>
+does the same for protocol numbers.</para>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/libtool-inst.xml b/chapter06/libtool-inst.xml
deleted file mode 100644
index 352c5200c..000000000
--- a/chapter06/libtool-inst.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Libtool</title>
-
-<para>Prepare Libtool for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index a7dfbbf50..9e9f9457f 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -7,6 +7,31 @@ Estimated required disk space: &libtool-compsize;</screen>
&aa-libtool-shortdesc;
&aa-libtool-dep;
-&c6-libtool-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Libtool</title>
+
+<para>Prepare Libtool for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/m4-inst.xml b/chapter06/m4-inst.xml
deleted file mode 100644
index 57e137bf8..000000000
--- a/chapter06/m4-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of M4</title>
-
-<para>Prepare M4 for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index b68c90333..b52647f10 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -7,7 +7,31 @@ Estimated required disk space: &m4-compsize;</screen>
&aa-m4-shortdesc;
&aa-m4-dep;
-&c6-m4-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of M4</title>
+
+<para>Prepare M4 for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/make-inst.xml b/chapter06/make-inst.xml
deleted file mode 100644
index c5a33444d..000000000
--- a/chapter06/make-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Make</title>
-
-<para>Prepare Make for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 0f477d832..f24d53ee3 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -7,6 +7,31 @@ Estimated required disk space: &make-compsize;</screen>
&aa-make-shortdesc;
&aa-make-dep;
-&c6-make-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Make</title>
+
+<para>Prepare Make for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml
deleted file mode 100644
index 15308031b..000000000
--- a/chapter06/makedev-inst.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Creating devices</title>
-
-<para>Note that unpacking the <filename>MAKEDEV-&makedev-version;.bz2</filename>
-file doesn't create a directory for you to <userinput>cd</userinput> into, as
-the file contains only a shell script.</para>
-
-<para>Install the <userinput>MAKEDEV</userinput> script:</para>
-
-<screen><userinput>bzcat MAKEDEV-&makedev-version;.bz2 &gt; /dev/MAKEDEV
-chmod 754 /dev/MAKEDEV</userinput></screen>
-
-<para>Run the script to create the device files:</para>
-
-<screen><userinput>cd /dev
-./MAKEDEV -v generic-nopty</userinput></screen>
-
-<para>The meaning of the arguments:</para>
-
-<itemizedlist>
-<listitem><para><userinput>-v</userinput>: This tells the script to run in
-verbose mode.</para></listitem>
-
-<listitem><para><userinput>generic-nopty</userinput>: This instructs
-<userinput>MAKEDEV</userinput> to create a generic selection of commonly used
-device special files, except for the ptyXX and ttyXX range of files. We don't
-need those files because we are going to use Unix98 PTYs via the
-<emphasis>devpts</emphasis> file system.</para></listitem>
-</itemizedlist>
-
-<para>If it turns out that some special device <filename>zzz</filename> that
-you need is missing, try running <userinput>./MAKEDEV -v zzz</userinput>.
-Alternatively, you may create devices via the <userinput>mknod</userinput>
-program. Please refer to its man and info pages if you need more
-information.</para>
-
-<para>Additionally, if you were unable to mount the devpts filesystem earlier in
-the "Mounting the proc and devpts file systems" section, now is the time to
-try the alternatives. If your kernel supports the devfs file system, run the
-following command to mount devfs:</para>
-
-<screen><userinput>mount -t devfs devfs /dev</userinput></screen>
-
-<para>This will mount the devfs file system over the top of the new static
-<filename>/dev</filename> structure. This poses no problems, as the device nodes
-created are still present, they are just hidden by the new devfs
-filesystem.</para>
-
-<para>If this still doesn't work, the only option left is to use the MAKEDEV
-script to create the ptyXX and ttyXX range of files that would otherwise not be
-needed. Ensure you are still in the <filename>/dev</filename> directory then run
-<userinput>./MAKEDEV -v pty</userinput>. The downside of this is, we are
-creating an extra 512 device special files which will not be needed when we
-finally boot into the finished LFS system.</para>
-
-</sect2>
-
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index e7005e574..acb766683 100644
--- a/chapter06/makedev.xml
+++ b/chapter06/makedev.xml
@@ -7,7 +7,65 @@ Estimated required disk space: &makedev-compsize;</screen>
&aa-makedev-shortdesc;
&aa-makedev-dep;
-&c6-makedev-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Creating devices</title>
+
+<para>Note that unpacking the <filename>MAKEDEV-&makedev-version;.bz2</filename>
+file doesn't create a directory for you to <userinput>cd</userinput> into, as
+the file contains only a shell script.</para>
+
+<para>Install the <userinput>MAKEDEV</userinput> script:</para>
+
+<screen><userinput>bzcat MAKEDEV-&makedev-version;.bz2 &gt; /dev/MAKEDEV
+chmod 754 /dev/MAKEDEV</userinput></screen>
+
+<para>Run the script to create the device files:</para>
+
+<screen><userinput>cd /dev
+./MAKEDEV -v generic-nopty</userinput></screen>
+
+<para>The meaning of the arguments:</para>
+
+<itemizedlist>
+<listitem><para><userinput>-v</userinput>: This tells the script to run in
+verbose mode.</para></listitem>
+
+<listitem><para><userinput>generic-nopty</userinput>: This instructs
+<userinput>MAKEDEV</userinput> to create a generic selection of commonly used
+device special files, except for the ptyXX and ttyXX range of files. We don't
+need those files because we are going to use Unix98 PTYs via the
+<emphasis>devpts</emphasis> file system.</para></listitem>
+</itemizedlist>
+
+<para>If it turns out that some special device <filename>zzz</filename> that
+you need is missing, try running <userinput>./MAKEDEV -v zzz</userinput>.
+Alternatively, you may create devices via the <userinput>mknod</userinput>
+program. Please refer to its man and info pages if you need more
+information.</para>
+
+<para>Additionally, if you were unable to mount the devpts filesystem earlier in
+the "Mounting the proc and devpts file systems" section, now is the time to
+try the alternatives. If your kernel supports the devfs file system, run the
+following command to mount devfs:</para>
+
+<screen><userinput>mount -t devfs devfs /dev</userinput></screen>
+
+<para>This will mount the devfs file system over the top of the new static
+<filename>/dev</filename> structure. This poses no problems, as the device nodes
+created are still present, they are just hidden by the new devfs
+filesystem.</para>
+
+<para>If this still doesn't work, the only option left is to use the MAKEDEV
+script to create the ptyXX and ttyXX range of files that would otherwise not be
+needed. Ensure you are still in the <filename>/dev</filename> directory then run
+<userinput>./MAKEDEV -v pty</userinput>. The downside of this is, we are
+creating an extra 512 device special files which will not be needed when we
+finally boot into the finished LFS system.</para>
+
+</sect2>
</sect1>
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
deleted file mode 100644
index 1d3b84a62..000000000
--- a/chapter06/man-inst.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Man</title>
-
-<para>We'll make three adjustments to the sources of Man.</para>
-
-<para>The first patch comments out the "MANPATH /usr/man" line in the
-<filename>man.conf</filename> file to prevent redundant results when using
- programs such as <userinput>whatis</userinput>:</para>
-
-<screen><userinput>patch -Np1 -i ../&man-manpath-patch;</userinput></screen>
-
-<para>The second patch adds the <emphasis>-R</emphasis> option to the
-<emphasis>PAGER</emphasis> variable so that escape sequences are
-handled properly:</para>
-
-<screen><userinput>patch -Np1 -i ../&man-pager-patch;</userinput></screen>
-
-<para>The third and last patch prevents a problem when man pages not formatted
-with more than 80 columns are used in conjunction with recent releases of
-<userinput>groff</userinput>:</para>
-
-<screen><userinput>patch -Np1 -i ../&man-80cols-patch;</userinput></screen>
-
-<para>Now prepare Man for compilation:</para>
-
-<screen><userinput>./configure -default -confdir=/etc</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<itemizedlist>
-<listitem><para><userinput>-default</userinput>: This tells the configure script
-to select a sensible set of default options. For example: only English man
-pages, no message catalogs, man not suid, handle compressed man pages, compress
-cat pages, create cat pages whenever the appropriate directory exists, follow
-FHS by putting cat pages under /var/cache/man provided that that directory
-exists.</para></listitem>
-
-<listitem><para><userinput>-confdir=/etc</userinput>: This tells the
-<userinput>man</userinput> program to look for the <filename>man.conf</filename>
-configuration file in the <filename>/etc</filename> directory.</para></listitem>
-</itemizedlist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<note><para>If you wish to disable SGR escape sequences, you should
-edit the man.conf file and add the <userinput>-c</userinput> argument
-to nroff.</para></note>
-
-<para>You may want to also take a look at the BLFS page at
-<ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/> which deals with
-formatting and compression issues for man pages.</para>
-
-</sect2>
-
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 9c0cd7978..833ff0e8e 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -7,7 +7,68 @@ Estimated required disk space: &man-compsize;</screen>
&aa-man-shortdesc;
&aa-man-dep;
-&c6-man-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Man</title>
+
+<para>We'll make three adjustments to the sources of Man.</para>
+
+<para>The first patch comments out the "MANPATH /usr/man" line in the
+<filename>man.conf</filename> file to prevent redundant results when using
+ programs such as <userinput>whatis</userinput>:</para>
+
+<screen><userinput>patch -Np1 -i ../&man-manpath-patch;</userinput></screen>
+
+<para>The second patch adds the <emphasis>-R</emphasis> option to the
+<emphasis>PAGER</emphasis> variable so that escape sequences are
+handled properly:</para>
+
+<screen><userinput>patch -Np1 -i ../&man-pager-patch;</userinput></screen>
+
+<para>The third and last patch prevents a problem when man pages not formatted
+with more than 80 columns are used in conjunction with recent releases of
+<userinput>groff</userinput>:</para>
+
+<screen><userinput>patch -Np1 -i ../&man-80cols-patch;</userinput></screen>
+
+<para>Now prepare Man for compilation:</para>
+
+<screen><userinput>./configure -default -confdir=/etc</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<itemizedlist>
+<listitem><para><userinput>-default</userinput>: This tells the configure script
+to select a sensible set of default options. For example: only English man
+pages, no message catalogs, man not suid, handle compressed man pages, compress
+cat pages, create cat pages whenever the appropriate directory exists, follow
+FHS by putting cat pages under /var/cache/man provided that that directory
+exists.</para></listitem>
+
+<listitem><para><userinput>-confdir=/etc</userinput>: This tells the
+<userinput>man</userinput> program to look for the <filename>man.conf</filename>
+configuration file in the <filename>/etc</filename> directory.</para></listitem>
+</itemizedlist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<note><para>If you wish to disable SGR escape sequences, you should
+edit the man.conf file and add the <userinput>-c</userinput> argument
+to nroff.</para></note>
+
+<para>You may want to also take a look at the BLFS page at
+<ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/> which deals with
+formatting and compression issues for man pages.</para>
+
+</sect2>
</sect1>
diff --git a/chapter06/manpages-inst.xml b/chapter06/manpages-inst.xml
deleted file mode 100644
index 587c681e3..000000000
--- a/chapter06/manpages-inst.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Man-pages</title>
-
-<para>Install Man-pages by running:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/manpages.xml b/chapter06/manpages.xml
index 78e14f3f0..699f68b74 100644
--- a/chapter06/manpages.xml
+++ b/chapter06/manpages.xml
@@ -7,6 +7,17 @@ Estimated required disk space: &man-pages-compsize;</screen>
&aa-manpages-shortdesc;
&aa-manpages-dep;
-&c6-manpages-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Man-pages</title>
+
+<para>Install Man-pages by running:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/modutils-inst.xml b/chapter06/modutils-inst.xml
deleted file mode 100644
index 71fd6e079..000000000
--- a/chapter06/modutils-inst.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Modutils</title>
-
-<para>Prepare Modutils for compilation:</para>
-
-<screen><userinput>./configure</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/modutils.xml b/chapter06/modutils.xml
index eb556ca76..d5c6708f1 100644
--- a/chapter06/modutils.xml
+++ b/chapter06/modutils.xml
@@ -7,6 +7,25 @@ Estimated required disk space: &modutils-compsize;</screen>
&aa-modutils-shortdesc;
&aa-modutils-dep;
-&c6-modutils-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Modutils</title>
+
+<para>Prepare Modutils for compilation:</para>
+
+<screen><userinput>./configure</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml
deleted file mode 100644
index e974379ee..000000000
--- a/chapter06/ncurses-inst.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Ncurses</title>
-
-<para>First fix two tiny bugs:</para>
-
-<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;
-patch -Np1 -i ../&ncurses-vsscanf-patch;</userinput></screen>
-
-<para>The first patch corrects the <filename>etip.h</filename> header file, and
-the second patch prevents some compiler warnings on the use of deprecated
-headers.</para>
-
-<para>Now prepare Ncurses for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --with-shared \
-&nbsp;&nbsp;&nbsp;&nbsp;--without-debug</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Give the Ncurses libraries execute permissions:</para>
-
-<screen><userinput>chmod 755 /usr/lib/*.&ncurses-version;</userinput></screen>
-
-<para>And fix a library that shouldn't be executable:</para>
-
-<screen><userinput>chmod 644 /usr/lib/libncurses++.a</userinput></screen>
-
-<para>Move the libraries to the <filename>/lib</filename> directory,
-where they're expected to reside:</para>
-
-<screen><userinput>mv /usr/lib/libncurses.so.5* /lib</userinput></screen>
-
-<para>Since the libraries have been moved to
-<filename>/lib</filename>, a few symlinks are currently pointing
-towards non-existing files. Recreate those symlinks:</para>
-
-<screen><userinput>ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
-ln -sf libncurses.so /usr/lib/libcurses.so</userinput></screen>
-</sect2>
-
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index aa97c4867..8cc9008d1 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -7,7 +7,54 @@ Estimated required disk space: &ncurses-compsize;</screen>
&aa-ncurses-shortdesc;
&aa-ncurses-dep;
-&c6-ncurses-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Ncurses</title>
+
+<para>First fix two tiny bugs:</para>
+
+<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;
+patch -Np1 -i ../&ncurses-vsscanf-patch;</userinput></screen>
+
+<para>The first patch corrects the <filename>etip.h</filename> header file, and
+the second patch prevents some compiler warnings on the use of deprecated
+headers.</para>
+
+<para>Now prepare Ncurses for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --with-shared \
+&nbsp;&nbsp;&nbsp;&nbsp;--without-debug</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Give the Ncurses libraries execute permissions:</para>
+
+<screen><userinput>chmod 755 /usr/lib/*.&ncurses-version;</userinput></screen>
+
+<para>And fix a library that shouldn't be executable:</para>
+
+<screen><userinput>chmod 644 /usr/lib/libncurses++.a</userinput></screen>
+
+<para>Move the libraries to the <filename>/lib</filename> directory,
+where they're expected to reside:</para>
+
+<screen><userinput>mv /usr/lib/libncurses.so.5* /lib</userinput></screen>
+
+<para>Since the libraries have been moved to
+<filename>/lib</filename>, a few symlinks are currently pointing
+towards non-existing files. Recreate those symlinks:</para>
+
+<screen><userinput>ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
+ln -sf libncurses.so /usr/lib/libcurses.so</userinput></screen>
+</sect2>
</sect1>
diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml
deleted file mode 100644
index fee875247..000000000
--- a/chapter06/nettools-inst.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Net-tools</title>
-
-<para>If you don't know what to answer to all the questions asked during the
-<userinput>make config</userinput> phase below, then just accept the defaults.
-This will be just fine in the majority of cases. What you're asked here is a
-bunch of questions about which network protocols you've enabled in your
-kernel. The default answers will enable the tools from this package to work
-with the most common protocols: TCP, PPP, and several others. You still need
-to actually enable these protocols in the kernel -- what you do here is merely
-telling the package to include support for those protocols in its programs,
-but it's up to the kernel to make the protocols available.</para>
-
-<para>First fix a small syntax problem in the sources of the mii-tool
-program:</para>
-
-<screen><userinput>patch -Np1 -i ../&net-tools-mii-patch;</userinput></screen>
-
-<para>Now prepare Net-tools for compilation with:</para>
-
-<screen><userinput>make config</userinput></screen>
-
-<para>If you intend to accept the default settings, you may skip the
-questions generated by <emphasis>make config</emphasis> by running
-<userinput>yes "" | make config</userinput> instead.</para>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make update</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index 417bd502d..61a6359d6 100644
--- a/chapter06/nettools.xml
+++ b/chapter06/nettools.xml
@@ -7,7 +7,44 @@ Estimated required disk space: &net-tools-compsize;</screen>
&aa-nettools-shortdesc;
&aa-nettools-dep;
-&c6-nettools-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Net-tools</title>
+
+<para>If you don't know what to answer to all the questions asked during the
+<userinput>make config</userinput> phase below, then just accept the defaults.
+This will be just fine in the majority of cases. What you're asked here is a
+bunch of questions about which network protocols you've enabled in your
+kernel. The default answers will enable the tools from this package to work
+with the most common protocols: TCP, PPP, and several others. You still need
+to actually enable these protocols in the kernel -- what you do here is merely
+telling the package to include support for those protocols in its programs,
+but it's up to the kernel to make the protocols available.</para>
+
+<para>First fix a small syntax problem in the sources of the mii-tool
+program:</para>
+
+<screen><userinput>patch -Np1 -i ../&net-tools-mii-patch;</userinput></screen>
+
+<para>Now prepare Net-tools for compilation with:</para>
+
+<screen><userinput>make config</userinput></screen>
+
+<para>If you intend to accept the default settings, you may skip the
+questions generated by <emphasis>make config</emphasis> by running
+<userinput>yes "" | make config</userinput> instead.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make update</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/patch-inst.xml b/chapter06/patch-inst.xml
deleted file mode 100644
index ead7ec11c..000000000
--- a/chapter06/patch-inst.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Patch</title>
-
-<para>Prepare Patch for compilation:</para>
-
-<screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen>
-
-<para>Again, the preprocessor flag <userinput>-D_GNU_SOURCE</userinput> is only
-needed on the PowerPC platform. On other architectures you can leave it out.</para>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index 442ad0e46..cc634a8e8 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -7,7 +7,28 @@ Estimated required disk space: &patch-compsize;</screen>
&aa-patch-shortdesc;
&aa-patch-dep;
-&c6-patch-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Patch</title>
+
+<para>Prepare Patch for compilation:</para>
+
+<screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen>
+
+<para>Again, the preprocessor flag <userinput>-D_GNU_SOURCE</userinput> is only
+needed on the PowerPC platform. On other architectures you can leave it out.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml
deleted file mode 100644
index 9b5466010..000000000
--- a/chapter06/perl-inst.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Perl</title>
-
-<para>Prepare Perl for compilation:</para>
-
-<screen><userinput>./configure.gnu --prefix=/usr</userinput></screen>
-
-<para>If you want more control over the way Perl sets itself up to be
-built, you can run the interactive <userinput>Configure</userinput> script
-instead and modify the way Perl is built. If you think you can live with the
-(sensible) defaults Perl auto-detects, then just use the command listed
-above.</para>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, you first
-have to create a basic <filename>/etc/hosts</filename> file, needed by a
-couple of tests to resolve the name <emphasis>localhost</emphasis>:</para>
-
-<screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
-
-<para>Now run the tests, if you wish:</para>
-
-<screen><userinput>make test</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 8528e6149..5e90ec069 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -7,7 +7,42 @@ Estimated required disk space: &perl-compsize;</screen>
&aa-perl-shortdesc;
&aa-perl-dep;
-&c6-perl-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Perl</title>
+
+<para>Prepare Perl for compilation:</para>
+
+<screen><userinput>./configure.gnu --prefix=/usr</userinput></screen>
+
+<para>If you want more control over the way Perl sets itself up to be
+built, you can run the interactive <userinput>Configure</userinput> script
+instead and modify the way Perl is built. If you think you can live with the
+(sensible) defaults Perl auto-detects, then just use the command listed
+above.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, you first
+have to create a basic <filename>/etc/hosts</filename> file, needed by a
+couple of tests to resolve the name <emphasis>localhost</emphasis>:</para>
+
+<screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
+
+<para>Now run the tests, if you wish:</para>
+
+<screen><userinput>make test</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/chapter06/procinfo-inst.xml b/chapter06/procinfo-inst.xml
deleted file mode 100644
index 9ed40c34d..000000000
--- a/chapter06/procinfo-inst.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Procinfo</title>
-
-<para>Compile Procinfo:</para>
-
-<screen><userinput>make LDLIBS=-lncurses</userinput></screen>
-
-<para>The meaning of the make parameter:</para>
-<itemizedlist>
-<listitem><para><userinput>LDLIBS=-lncurses</userinput>: This tells Procinfo
-to use the <filename>libncurses</filename> library instead of the
-long-obsolete <filename>libtermcap</filename>.</para></listitem>
-</itemizedlist>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/procinfo.xml b/chapter06/procinfo.xml
index 70eabfca6..e02b583b6 100644
--- a/chapter06/procinfo.xml
+++ b/chapter06/procinfo.xml
@@ -7,6 +7,28 @@ Estimated required disk space: &procinfo-compsize;</screen>
&aa-procinfo-shortdesc;
&aa-procinfo-dep;
-&c6-procinfo-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Procinfo</title>
+
+<para>Compile Procinfo:</para>
+
+<screen><userinput>make LDLIBS=-lncurses</userinput></screen>
+
+<para>The meaning of the make parameter:</para>
+<itemizedlist>
+<listitem><para><userinput>LDLIBS=-lncurses</userinput>: This tells Procinfo
+to use the <filename>libncurses</filename> library instead of the
+long-obsolete <filename>libtermcap</filename>.</para></listitem>
+</itemizedlist>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml
deleted file mode 100644
index 000145462..000000000
--- a/chapter06/procps-inst.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Procps</title>
-
-<para>First fix a problem that can crash <userinput>w</userinput> under
-certain locale settings:</para>
-
-<screen><userinput>patch -Np1 -i ../&procps-patch;</userinput></screen>
-
-<para>Now compile Procps:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And remove a spurious library link:</para>
-
-<screen><userinput>rm /lib/libproc.so</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index eb28a8f76..a2a4fb14b 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -7,6 +7,30 @@ Estimated required disk space: &procps-compsize;</screen>
&aa-procps-shortdesc;
&aa-procps-dep;
-&c6-procps-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Procps</title>
+
+<para>First fix a problem that can crash <userinput>w</userinput> under
+certain locale settings:</para>
+
+<screen><userinput>patch -Np1 -i ../&procps-patch;</userinput></screen>
+
+<para>Now compile Procps:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And remove a spurious library link:</para>
+
+<screen><userinput>rm /lib/libproc.so</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml
deleted file mode 100644
index 740a808e1..000000000
--- a/chapter06/psmisc-inst.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Psmisc</title>
-
-<para>Prepare Psmisc for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --exec-prefix=/</userinput></screen>
-
-<para>The meaning of the configure option:</para>
-
-<itemizedlist>
-<listitem><para><userinput>--exec-prefix=/</userinput>: This causes the
-binaries to be installed in <filename>/bin</filename> and not in
-<filename>/usr/bin</filename>. As the Psmisc programs are often used in
-bootscripts, they should be available also when the <filename>/usr</filename>
-filesystem isn't mounted.</para></listitem>
-</itemizedlist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>By default Psmisc's <userinput>pidof</userinput> program isn't installed.
-Generally, this isn't a problem because we later install the Sysvinit package,
-which provides a better <userinput>pidof</userinput> program. But if you're not
-going to use Sysvinit, you should complete the installation of Psmisc by
-creating the following symlink:</para>
-
-<screen><userinput>ln -s killall /bin/pidof</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index e2a9d6c6e..3b939961d 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -7,6 +7,43 @@ Estimated required disk space: &psmisc-compsize;</screen>
&aa-psmisc-shortdesc;
&aa-psmisc-dep;
-&c6-psmisc-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Psmisc</title>
+
+<para>Prepare Psmisc for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --exec-prefix=/</userinput></screen>
+
+<para>The meaning of the configure option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--exec-prefix=/</userinput>: This causes the
+binaries to be installed in <filename>/bin</filename> and not in
+<filename>/usr/bin</filename>. As the Psmisc programs are often used in
+bootscripts, they should be available also when the <filename>/usr</filename>
+filesystem isn't mounted.</para></listitem>
+</itemizedlist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>By default Psmisc's <userinput>pidof</userinput> program isn't installed.
+Generally, this isn't a problem because we later install the Sysvinit package,
+which provides a better <userinput>pidof</userinput> program. But if you're not
+going to use Sysvinit, you should complete the installation of Psmisc by
+creating the following symlink:</para>
+
+<screen><userinput>ln -s killall /bin/pidof</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/sed-inst.xml b/chapter06/sed-inst.xml
deleted file mode 100644
index 4ea0a401f..000000000
--- a/chapter06/sed-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Sed</title>
-
-<para>Prepare Sed for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 9cdcf6b69..25f9b488d 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -7,6 +7,31 @@ Estimated required disk space: &sed-compsize;</screen>
&aa-sed-shortdesc;
&aa-sed-dep;
-&c6-sed-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Sed</title>
+
+<para>Prepare Sed for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
deleted file mode 100644
index 2632f7732..000000000
--- a/chapter06/shadowpwd-inst.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Shadow</title>
-
-<para>The <userinput>login</userinput>, <userinput>getty</userinput> and
-<userinput>init</userinput> programs (and some others) maintain a number
-of logfiles to record who are and who were logged in to the system. These
-programs, however, don't create these logfiles when they don't exist, so if
-you want this logging to occur you will have to create the files yourself.
-The Shadow package needs to detect these files in their proper place, so we
-create them now, with their proper permissions:</para>
-
-<screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
-chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp}</userinput></screen>
-
-<para>The <filename>/var/run/utmp</filename> file lists the users that are
-currently logged in, the <filename>/var/log/wtmp</filename> file who
-<emphasis>were</emphasis> logged in and when.
-The <filename>/var/log/lastlog</filename> file shows for each user when he
-or she last logged in, and the <filename>/var/log/btmp</filename> lists the
-bad login attempts.</para>
-
-<para>Shadow hard-wires the path to the <userinput>passwd</userinput> binary
-within the binary itself, but does this the wrong way. If a
-<userinput>passwd</userinput> binary is not present before installing Shadow,
-the package incorrectly assumes it is going to be located at
-<filename>/bin/passwd</filename>, but then installs it in
-<filename>/usr/bin/passwd</filename>. This will lead to errors about not finding
-<filename>/bin/passwd</filename>. To work around this bug, create a dummy
-<filename>passwd</filename> file, so that it gets hard-wired properly:</para>
-
-<screen><userinput>touch /usr/bin/passwd</userinput></screen>
-
-<para>The current Shadow suite has a problem that causes the
-<userinput>newgrp</userinput> command to fail. The following patch (also
-appearing in Shadow's CVS code) fixes this problem:</para>
-
-<screen><userinput>patch -Np1 -i ../&shadow-patch;</userinput></screen>
-
-<para>Now prepare Shadow for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --libdir=/usr/lib --enable-shared</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Shadow uses two files to configure authentication settings for the
-system. Install these two config files:</para>
-
-<screen><userinput>cp etc/{limits,login.access} /etc</userinput></screen>
-
-<para>We want to change the password method to enable MD5 passwords which are
-theoretically more secure than the default "crypt" method and also allow
-password lengths greater than 8 characters. We also need to change the old
-<filename class="directory">/var/spool/mail</filename> location for user
-mailboxes to the current location at
-<filename class="directory">/var/mail</filename>. We do this by changing the
-relevant configuration file while copying it to its destination:</para>
-
-<screen><userinput>sed -e 's%/var/spool/mail%/var/mail%' \
-&nbsp;&nbsp;&nbsp;&nbsp;-e 's%#MD5_CRYPT_ENAB.no%MD5_CRYPT_ENAB yes%' \
-&nbsp;&nbsp;&nbsp;&nbsp;etc/login.defs.linux &gt; /etc/login.defs</userinput></screen>
-
-<note><para>Be extra careful when typing all of the above. It is probably safer
-to cut-and-paste it rather than try and type it all in.</para></note>
-
-<para>According to the man page of <userinput>vipw</userinput>, a
-<userinput>vigr</userinput> program should exist too. Since the installation
-procedure doesn't create this program, create a symlink manually:</para>
-
-<screen><userinput>ln -s vipw /usr/sbin/vigr</userinput></screen>
-
-<para>As the <filename>/bin/vipw</filename> symlink is redundant (and even
-pointing to a non-existent file), remove it:</para>
-
-<screen><userinput>rm /bin/vipw</userinput></screen>
-
-<para>Now move the <userinput>sg</userinput> program to its proper place:</para>
-
-<screen><userinput>mv /bin/sg /usr/bin</userinput></screen>
-
-<para>And move Shadow's dynamic libraries to a more appropriate location:</para>
-
-<screen><userinput>mv /usr/lib/lib{shadow,misc}.so.0* /lib</userinput></screen>
-
-<para>As some packages expect to find the just-moved libraries in
-<filename>/usr/lib</filename>, create the following symlinks:</para>
-
-<screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
-ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so</userinput></screen>
-
-<para>Coreutils has already installed a <userinput>groups</userinput> program
-in <filename>/usr/bin</filename>. If you wish, you can remove the one
-installed by Shadow:</para>
-
-<screen><userinput>rm /bin/groups</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index f6238c0b1..d61415e08 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadowpwd.xml
@@ -7,7 +7,111 @@ Estimated required disk space: &shadow-compsize;</screen>
&aa-shadowpwd-shortdesc;
&aa-shadowpwd-dep;
-&c6-shadowpwd-inst;
-&c6-cf-shadowpwd;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Shadow</title>
+
+<para>The <userinput>login</userinput>, <userinput>getty</userinput> and
+<userinput>init</userinput> programs (and some others) maintain a number
+of logfiles to record who are and who were logged in to the system. These
+programs, however, don't create these logfiles when they don't exist, so if
+you want this logging to occur you will have to create the files yourself.
+The Shadow package needs to detect these files in their proper place, so we
+create them now, with their proper permissions:</para>
+
+<screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
+chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp}</userinput></screen>
+
+<para>The <filename>/var/run/utmp</filename> file lists the users that are
+currently logged in, the <filename>/var/log/wtmp</filename> file who
+<emphasis>were</emphasis> logged in and when.
+The <filename>/var/log/lastlog</filename> file shows for each user when he
+or she last logged in, and the <filename>/var/log/btmp</filename> lists the
+bad login attempts.</para>
+
+<para>Shadow hard-wires the path to the <userinput>passwd</userinput> binary
+within the binary itself, but does this the wrong way. If a
+<userinput>passwd</userinput> binary is not present before installing Shadow,
+the package incorrectly assumes it is going to be located at
+<filename>/bin/passwd</filename>, but then installs it in
+<filename>/usr/bin/passwd</filename>. This will lead to errors about not finding
+<filename>/bin/passwd</filename>. To work around this bug, create a dummy
+<filename>passwd</filename> file, so that it gets hard-wired properly:</para>
+
+<screen><userinput>touch /usr/bin/passwd</userinput></screen>
+
+<para>The current Shadow suite has a problem that causes the
+<userinput>newgrp</userinput> command to fail. The following patch (also
+appearing in Shadow's CVS code) fixes this problem:</para>
+
+<screen><userinput>patch -Np1 -i ../&shadow-patch;</userinput></screen>
+
+<para>Now prepare Shadow for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --libdir=/usr/lib --enable-shared</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Shadow uses two files to configure authentication settings for the
+system. Install these two config files:</para>
+
+<screen><userinput>cp etc/{limits,login.access} /etc</userinput></screen>
+
+<para>We want to change the password method to enable MD5 passwords which are
+theoretically more secure than the default "crypt" method and also allow
+password lengths greater than 8 characters. We also need to change the old
+<filename class="directory">/var/spool/mail</filename> location for user
+mailboxes to the current location at
+<filename class="directory">/var/mail</filename>. We do this by changing the
+relevant configuration file while copying it to its destination:</para>
+
+<screen><userinput>sed -e 's%/var/spool/mail%/var/mail%' \
+&nbsp;&nbsp;&nbsp;&nbsp;-e 's%#MD5_CRYPT_ENAB.no%MD5_CRYPT_ENAB yes%' \
+&nbsp;&nbsp;&nbsp;&nbsp;etc/login.defs.linux &gt; /etc/login.defs</userinput></screen>
+
+<note><para>Be extra careful when typing all of the above. It is probably safer
+to cut-and-paste it rather than try and type it all in.</para></note>
+
+<para>According to the man page of <userinput>vipw</userinput>, a
+<userinput>vigr</userinput> program should exist too. Since the installation
+procedure doesn't create this program, create a symlink manually:</para>
+
+<screen><userinput>ln -s vipw /usr/sbin/vigr</userinput></screen>
+
+<para>As the <filename>/bin/vipw</filename> symlink is redundant (and even
+pointing to a non-existent file), remove it:</para>
+
+<screen><userinput>rm /bin/vipw</userinput></screen>
+
+<para>Now move the <userinput>sg</userinput> program to its proper place:</para>
+
+<screen><userinput>mv /bin/sg /usr/bin</userinput></screen>
+
+<para>And move Shadow's dynamic libraries to a more appropriate location:</para>
+
+<screen><userinput>mv /usr/lib/lib{shadow,misc}.so.0* /lib</userinput></screen>
+
+<para>As some packages expect to find the just-moved libraries in
+<filename>/usr/lib</filename>, create the following symlinks:</para>
+
+<screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
+ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so</userinput></screen>
+
+<para>Coreutils has already installed a <userinput>groups</userinput> program
+in <filename>/usr/bin</filename>. If you wish, you can remove the one
+installed by Shadow:</para>
+
+<screen><userinput>rm /bin/groups</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/sysklogd-inst.xml b/chapter06/sysklogd-inst.xml
deleted file mode 100644
index 3ce0f9097..000000000
--- a/chapter06/sysklogd-inst.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Sysklogd</title>
-
-<para>Compile Sysklogd:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 53b5028cc..c5fee1038 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -7,7 +7,21 @@ Estimated required disk space: &sysklogd-compsize;</screen>
&aa-sysklogd-shortdesc;
&aa-sysklogd-dep;
-&c6-sysklogd-inst;
-&c6-cf-sysklogd;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Sysklogd</title>
+
+<para>Compile Sysklogd:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml
deleted file mode 100644
index 08f24bf9c..000000000
--- a/chapter06/sysvinit-inst.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Sysvinit</title>
-
-<para>When run levels are changed (for example, when halting the system),
-init sends the TERM and KILL signals to the processes which it started.
-Init prints "Sending processes the TERM signal" to the screen. This seems
-to imply that init is sending these signals to all the currently running
-processes. To avoid this confusion, the init.c file can be modified, so
-that the sentence reads "Sending processes started by init the TERM
-signal".</para>
-
-<para>Edit the halt message:</para>
-
-<screen><userinput>cp src/init.c{,.backup}
-sed 's/Sending processes/Sending processes started by init/g' \
-&nbsp;&nbsp;&nbsp;&nbsp;src/init.c.backup &gt; src/init.c</userinput></screen>
-
-<para>Compile Sysvinit:</para>
-
-<screen><userinput>make -C src</userinput></screen>
-
-<para>And install it:</para>
-
-<screen><userinput>make -C src install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 69826f4d5..934e5cfd5 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -7,7 +7,35 @@ Estimated required disk space: &sysvinit-compsize;</screen>
&aa-sysvinit-shortdesc;
&aa-sysvinit-dep;
-&c6-sysvinit-inst;
-&c6-cf-sysvinit;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Sysvinit</title>
+
+<para>When run levels are changed (for example, when halting the system),
+init sends the TERM and KILL signals to the processes which it started.
+Init prints "Sending processes the TERM signal" to the screen. This seems
+to imply that init is sending these signals to all the currently running
+processes. To avoid this confusion, the init.c file can be modified, so
+that the sentence reads "Sending processes started by init the TERM
+signal".</para>
+
+<para>Edit the halt message:</para>
+
+<screen><userinput>cp src/init.c{,.backup}
+sed 's/Sending processes/Sending processes started by init/g' \
+&nbsp;&nbsp;&nbsp;&nbsp;src/init.c.backup &gt; src/init.c</userinput></screen>
+
+<para>Compile Sysvinit:</para>
+
+<screen><userinput>make -C src</userinput></screen>
+
+<para>And install it:</para>
+
+<screen><userinput>make -C src install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml
deleted file mode 100644
index 035682096..000000000
--- a/chapter06/tar-inst.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Tar</title>
-
-<para>Prepare Tar for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --bindir=/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 94c05c86d..3e511f323 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -7,6 +7,32 @@ Estimated required disk space: &tar-compsize;</screen>
&aa-tar-shortdesc;
&aa-tar-dep;
-&c6-tar-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Tar</title>
+
+<para>Prepare Tar for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --bindir=/bin \
+&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/texinfo-inst.xml b/chapter06/texinfo-inst.xml
deleted file mode 100644
index 16c391535..000000000
--- a/chapter06/texinfo-inst.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Texinfo</title>
-
-<para>Prepare Texinfo for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make check</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>And optionally install the components belonging in a TeX installation:</para>
-
-<screen><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
-
-<para>The meaning of the make option:</para>
-
-<itemizedlist>
-<listitem><para><userinput>TEXMF=/usr/share/texmf</userinput>: The TEXMF
-makefile variable holds the location of the root of your TeX tree if, for
-example, you plan to install a TeX package later on.</para></listitem>
-</itemizedlist>
-
-</sect2>
-
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 745c044f1..a00d157eb 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -7,6 +7,43 @@ Estimated required disk space: &texinfo-compsize;</screen>
&aa-texinfo-shortdesc;
&aa-texinfo-dep;
-&c6-texinfo-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Texinfo</title>
+
+<para>Prepare Texinfo for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>And optionally install the components belonging in a TeX installation:</para>
+
+<screen><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
+
+<para>The meaning of the make option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>TEXMF=/usr/share/texmf</userinput>: The TEXMF
+makefile variable holds the location of the root of your TeX tree if, for
+example, you plan to install a TeX package later on.</para></listitem>
+</itemizedlist>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml
deleted file mode 100644
index 7bfd91bff..000000000
--- a/chapter06/utillinux-inst.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>FHS compliance notes</title>
-
-<para>The FHS recommends that we use <filename>/var/lib/hwclock</filename>,
-instead of the usual <filename>/etc</filename>, as the location for the
-<filename>adjtime</filename> file. To make the <userinput>hwclock</userinput>
-program FHS-compliant, run the following:</para>
-
-<screen><userinput>cp hwclock/hwclock.c{,.backup}
-sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
-&nbsp;&nbsp;&nbsp;&nbsp;hwclock/hwclock.c.backup &gt; hwclock/hwclock.c
-mkdir -p /var/lib/hwclock</userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Installation of Util-linux</title>
-
-<para>Prepare Util-linux for compilation:</para>
-
-<screen><userinput>./configure</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make HAVE_SLN=yes</userinput></screen>
-
-<para>The meaning of the make parameter:</para>
-
-<itemizedlist>
-<listitem><para><userinput>HAVE_SLN=yes</userinput>: This prevents the
-<userinput>sln</userinput> program (a statically linked
-<userinput>ln</userinput>, already installed by Glibc) from being built
-again.</para></listitem>
-</itemizedlist>
-
-<para>And install the package:</para>
-
-<screen><userinput>make HAVE_SLN=yes install</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml
index 6238ca924..487736df2 100644
--- a/chapter06/utillinux.xml
+++ b/chapter06/utillinux.xml
@@ -7,6 +7,49 @@ Estimated required disk space: &util-linux-compsize;</screen>
&aa-utillinux-shortdesc;
&aa-utillinux-dep;
-&c6-utillinux-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>FHS compliance notes</title>
+
+<para>The FHS recommends that we use <filename>/var/lib/hwclock</filename>,
+instead of the usual <filename>/etc</filename>, as the location for the
+<filename>adjtime</filename> file. To make the <userinput>hwclock</userinput>
+program FHS-compliant, run the following:</para>
+
+<screen><userinput>cp hwclock/hwclock.c{,.backup}
+sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
+&nbsp;&nbsp;&nbsp;&nbsp;hwclock/hwclock.c.backup &gt; hwclock/hwclock.c
+mkdir -p /var/lib/hwclock</userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Installation of Util-linux</title>
+
+<para>Prepare Util-linux for compilation:</para>
+
+<screen><userinput>./configure</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make HAVE_SLN=yes</userinput></screen>
+
+<para>The meaning of the make parameter:</para>
+
+<itemizedlist>
+<listitem><para><userinput>HAVE_SLN=yes</userinput>: This prevents the
+<userinput>sln</userinput> program (a statically linked
+<userinput>ln</userinput>, already installed by Glibc) from being built
+again.</para></listitem>
+</itemizedlist>
+
+<para>And install the package:</para>
+
+<screen><userinput>make HAVE_SLN=yes install</userinput></screen>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
deleted file mode 100644
index 28e261969..000000000
--- a/chapter06/vim-inst.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Vim</title>
-
-<para>Change the default locations of the <filename>vimrc</filename> and
-<filename>gvimrc</filename> files to <filename
-class="directory">/etc</filename>.</para>
-
-<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h
-echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput></screen>
-
-<para>Now prepare Vim for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Vim can run in old-fashioned <emphasis>vi</emphasis> mode by
-creating a symlink, which may be created with the following command:</para>
-
-<screen><userinput>ln -s vim /usr/bin/vi</userinput></screen>
-
-<para>If you plan to install the X Window system on your LFS
-system, you might want to re-compile Vim after you have installed X. Vim
-comes with a nice GUI version of the editor which requires X and a few
-other libraries to be installed. For more information read the Vim
-documentation.</para>
-
-</sect2>
-
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index a35b54f8c..3c830af75 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -16,7 +16,43 @@ suggested installation instructions.</para>
&aa-vim-shortdesc;
&aa-vim-dep;
-&c6-vim-inst;
-&c6-cf-vim;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Vim</title>
+
+<para>Change the default locations of the <filename>vimrc</filename> and
+<filename>gvimrc</filename> files to <filename
+class="directory">/etc</filename>.</para>
+
+<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h
+echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput></screen>
+
+<para>Now prepare Vim for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Vim can run in old-fashioned <emphasis>vi</emphasis> mode by
+creating a symlink, which may be created with the following command:</para>
+
+<screen><userinput>ln -s vim /usr/bin/vi</userinput></screen>
+
+<para>If you plan to install the X Window system on your LFS
+system, you might want to re-compile Vim after you have installed X. Vim
+comes with a nice GUI version of the editor which requires X and a few
+other libraries to be installed. For more information read the Vim
+documentation.</para>
+
+</sect2>
</sect1>
+
diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml
deleted file mode 100644
index c142e51eb..000000000
--- a/chapter06/zlib-inst.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Zlib</title>
-
-<para>Zlib has a potential buffer overflow in its
-<emphasis>gzprintf()</emphasis> function, that, though difficult to take
-advantage of, should be taken care of by applying this patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&zlib-patch;</userinput></screen>
-
-<para>Now prepare Zlib for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --shared</userinput></screen>
-
-<para>Note: Zlib is known to build its shared library incorrectly if a CFLAGS
-is specified in the environment. If you are using your own CFLAGS variables,
-ensure you add the <emphasis role="strong">-fPIC</emphasis> directive during
-this stage, and remove it afterwards.</para>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the shared libraries:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Now also build the non-shared libraries:</para>
-<screen><userinput>make clean
-./configure --prefix=/usr
-make</userinput></screen>
-
-<para>This package has a test suite available which can perform a number of
-checks to ensure it built correctly. Should you choose to run it, the
-following command will do so:</para>
-
-<screen><userinput>make test</userinput></screen>
-
-<para>And install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>The shared Zlib library should be installed in the
-<filename>/lib</filename> directory. That way, in the event
-that you must boot without the <filename>/usr</filename>
-directory, vital system programs will still have access to
-the library:</para>
-
-<screen><userinput>mv /usr/lib/libz.so.* /lib</userinput></screen>
-
-<para>The <filename>/usr/lib/libz.so</filename> symlink is
-linked to a file which no longer exists, because we moved
-it. Create a symbolic link to the new location of the
-library:</para>
-
-<screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
-
-<para>Zlib does not install its manual page. Issue the
-following command to install this documentation:</para>
-
-<screen><userinput>cp zlib.3 /usr/share/man/man3</userinput></screen>
-
-</sect2>
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 0a204357d..fba00043f 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -7,7 +7,71 @@ Estimated required disk space: &zlib-compsize;</screen>
&aa-zlib-shortdesc;
&aa-zlib-dep;
-&c6-zlib-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Zlib</title>
+
+<para>Zlib has a potential buffer overflow in its
+<emphasis>gzprintf()</emphasis> function, that, though difficult to take
+advantage of, should be taken care of by applying this patch:</para>
+
+<screen><userinput>patch -Np1 -i ../&zlib-patch;</userinput></screen>
+
+<para>Now prepare Zlib for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --shared</userinput></screen>
+
+<para>Note: Zlib is known to build its shared library incorrectly if a CFLAGS
+is specified in the environment. If you are using your own CFLAGS variables,
+ensure you add the <emphasis role="strong">-fPIC</emphasis> directive during
+this stage, and remove it afterwards.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install the shared libraries:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Now also build the non-shared libraries:</para>
+<screen><userinput>make clean
+./configure --prefix=/usr
+make</userinput></screen>
+
+<para>This package has a test suite available which can perform a number of
+checks to ensure it built correctly. Should you choose to run it, the
+following command will do so:</para>
+
+<screen><userinput>make test</userinput></screen>
+
+<para>And install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>The shared Zlib library should be installed in the
+<filename>/lib</filename> directory. That way, in the event
+that you must boot without the <filename>/usr</filename>
+directory, vital system programs will still have access to
+the library:</para>
+
+<screen><userinput>mv /usr/lib/libz.so.* /lib</userinput></screen>
+
+<para>The <filename>/usr/lib/libz.so</filename> symlink is
+linked to a file which no longer exists, because we moved
+it. Create a symbolic link to the new location of the
+library:</para>
+
+<screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
+
+<para>Zlib does not install its manual page. Issue the
+following command to install this documentation:</para>
+
+<screen><userinput>cp zlib.3 /usr/share/man/man3</userinput></screen>
+
+</sect2>
</sect1>
diff --git a/entities/autoconf.ent b/entities/autoconf.ent
index a20378e4d..23a6553bc 100644
--- a/entities/autoconf.ent
+++ b/entities/autoconf.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-autoconf SYSTEM "../chapter06/autoconf.xml">
-<!ENTITY c6-autoconf-inst SYSTEM "../chapter06/autoconf-inst.xml">
<!ENTITY aa-autoconf SYSTEM "../appendixa/autoconf.xml">
<!ENTITY aa-autoconf-shortdesc SYSTEM "../appendixa/autoconf-shortdesc.xml">
diff --git a/entities/automake.ent b/entities/automake.ent
index c2d268c7c..bec4ae3af 100644
--- a/entities/automake.ent
+++ b/entities/automake.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-automake SYSTEM "../chapter06/automake.xml">
-<!ENTITY c6-automake-inst SYSTEM "../chapter06/automake-inst.xml">
<!ENTITY aa-automake SYSTEM "../appendixa/automake.xml">
<!ENTITY aa-automake-shortdesc SYSTEM "../appendixa/automake-shortdesc.xml">
diff --git a/entities/bash.ent b/entities/bash.ent
index d9aecc6f5..068660a75 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-bash SYSTEM "../chapter05/bash.xml">
-<!ENTITY c5-bash-inst SYSTEM "../chapter05/bash-inst.xml">
<!ENTITY c6-bash SYSTEM "../chapter06/bash.xml">
-<!ENTITY c6-bash-inst SYSTEM "../chapter06/bash-inst.xml">
<!ENTITY aa-bash SYSTEM "../appendixa/bash.xml">
<!ENTITY aa-bash-shortdesc SYSTEM "../appendixa/bash-shortdesc.xml">
diff --git a/entities/binutils.ent b/entities/binutils.ent
index 0ad8ad8fc..0af339bc7 100644
--- a/entities/binutils.ent
+++ b/entities/binutils.ent
@@ -1,10 +1,7 @@
<!ENTITY c5-binutils-pass1 SYSTEM "../chapter05/binutils-pass1.xml">
-<!ENTITY c5-binutils-pass1-inst SYSTEM "../chapter05/binutils-pass1-inst.xml">
<!ENTITY c5-binutils-pass2 SYSTEM "../chapter05/binutils-pass2.xml">
-<!ENTITY c5-binutils-pass2-inst SYSTEM "../chapter05/binutils-pass2-inst.xml">
<!ENTITY c6-binutils SYSTEM "../chapter06/binutils.xml">
-<!ENTITY c6-binutils-inst SYSTEM "../chapter06/binutils-inst.xml">
<!ENTITY aa-binutils SYSTEM "../appendixa/binutils.xml">
<!ENTITY aa-binutils-shortdesc SYSTEM "../appendixa/binutils-shortdesc.xml">
diff --git a/entities/bison.ent b/entities/bison.ent
index 14aa31373..c16adcfab 100644
--- a/entities/bison.ent
+++ b/entities/bison.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-bison SYSTEM "../chapter06/bison.xml">
-<!ENTITY c6-bison-inst SYSTEM "../chapter06/bison-inst.xml">
<!ENTITY aa-bison SYSTEM "../appendixa/bison.xml">
<!ENTITY aa-bison-shortdesc SYSTEM "../appendixa/bison-shortdesc.xml">
diff --git a/entities/bootscripts.ent b/entities/bootscripts.ent
index 01a6d3987..0bad9818d 100644
--- a/entities/bootscripts.ent
+++ b/entities/bootscripts.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-bootscripts SYSTEM "../chapter06/bootscripts.xml">
-<!ENTITY c6-bootscripts-inst SYSTEM "../chapter06/bootscripts-inst.xml">
<!ENTITY aa-bootscripts SYSTEM "../appendixa/bootscripts.xml">
<!ENTITY aa-bootscripts-shortdesc SYSTEM "../appendixa/bootscripts-shortdesc.xml">
diff --git a/entities/bzip2.ent b/entities/bzip2.ent
index da9ef7858..8c825c27e 100644
--- a/entities/bzip2.ent
+++ b/entities/bzip2.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-bzip2 SYSTEM "../chapter05/bzip2.xml">
-<!ENTITY c5-bzip2-inst SYSTEM "../chapter05/bzip2-inst.xml">
<!ENTITY c6-bzip2 SYSTEM "../chapter06/bzip2.xml">
-<!ENTITY c6-bzip2-inst SYSTEM "../chapter06/bzip2-inst.xml">
<!ENTITY aa-bzip2 SYSTEM "../appendixa/bzip2.xml">
<!ENTITY aa-bzip2-shortdesc SYSTEM "../appendixa/bzip2-shortdesc.xml">
diff --git a/entities/coreutils.ent b/entities/coreutils.ent
index e339f270e..43baa2f3c 100644
--- a/entities/coreutils.ent
+++ b/entities/coreutils.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-coreutils SYSTEM "../chapter05/coreutils.xml">
-<!ENTITY c5-coreutils-inst SYSTEM "../chapter05/coreutils-inst.xml">
<!ENTITY c6-coreutils SYSTEM "../chapter06/coreutils.xml">
-<!ENTITY c6-coreutils-inst SYSTEM "../chapter06/coreutils-inst.xml">
<!ENTITY aa-coreutils SYSTEM "../appendixa/coreutils.xml">
<!ENTITY aa-coreutils-shortdesc SYSTEM "../appendixa/coreutils-shortdesc.xml">
diff --git a/entities/dejagnu.ent b/entities/dejagnu.ent
index 8af0906f0..832f5490a 100644
--- a/entities/dejagnu.ent
+++ b/entities/dejagnu.ent
@@ -1,5 +1,4 @@
<!ENTITY c5-dejagnu SYSTEM "../chapter05/dejagnu.xml">
-<!ENTITY c5-dejagnu-inst SYSTEM "../chapter05/dejagnu-inst.xml">
<!ENTITY aa-dejagnu SYSTEM "../appendixa/dejagnu.xml">
<!ENTITY aa-dejagnu-shortdesc SYSTEM "../appendixa/dejagnu-shortdesc.xml">
diff --git a/entities/diffutils.ent b/entities/diffutils.ent
index 277dfe429..0b30a11f9 100644
--- a/entities/diffutils.ent
+++ b/entities/diffutils.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-diffutils SYSTEM "../chapter05/diffutils.xml">
-<!ENTITY c5-diffutils-inst SYSTEM "../chapter05/diffutils-inst.xml">
<!ENTITY c6-diffutils SYSTEM "../chapter06/diffutils.xml">
-<!ENTITY c6-diffutils-inst SYSTEM "../chapter06/diffutils-inst.xml">
<!ENTITY aa-diffutils SYSTEM "../appendixa/diffutils.xml">
<!ENTITY aa-diffutils-shortdesc SYSTEM "../appendixa/diffutils-shortdesc.xml">
diff --git a/entities/e2fsprogs.ent b/entities/e2fsprogs.ent
index 18cc70d27..6b4b4bc93 100644
--- a/entities/e2fsprogs.ent
+++ b/entities/e2fsprogs.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-e2fsprogs SYSTEM "../chapter06/e2fsprogs.xml">
-<!ENTITY c6-e2fsprogs-inst SYSTEM "../chapter06/e2fsprogs-inst.xml">
<!ENTITY aa-e2fsprogs SYSTEM "../appendixa/e2fsprogs.xml">
<!ENTITY aa-e2fsprogs-shortdesc SYSTEM "../appendixa/e2fsprogs-shortdesc.xml">
diff --git a/entities/ed.ent b/entities/ed.ent
index 3c98409da..72709b686 100644
--- a/entities/ed.ent
+++ b/entities/ed.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-ed SYSTEM "../chapter06/ed.xml">
-<!ENTITY c6-ed-inst SYSTEM "../chapter06/ed-inst.xml">
<!ENTITY aa-ed SYSTEM "../appendixa/ed.xml">
<!ENTITY aa-ed-shortdesc SYSTEM "../appendixa/ed-shortdesc.xml">
diff --git a/entities/expect.ent b/entities/expect.ent
index 90f0a2e01..58a694ace 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -1,5 +1,4 @@
<!ENTITY c5-expect SYSTEM "../chapter05/expect.xml">
-<!ENTITY c5-expect-inst SYSTEM "../chapter05/expect-inst.xml">
<!ENTITY aa-expect SYSTEM "../appendixa/expect.xml">
<!ENTITY aa-expect-shortdesc SYSTEM "../appendixa/expect-shortdesc.xml">
diff --git a/entities/file.ent b/entities/file.ent
index 35699efc0..efc4594e9 100644
--- a/entities/file.ent
+++ b/entities/file.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-file SYSTEM "../chapter06/file.xml">
-<!ENTITY c6-file-inst SYSTEM "../chapter06/file-inst.xml">
<!ENTITY aa-file SYSTEM "../appendixa/file.xml">
<!ENTITY aa-file-shortdesc SYSTEM "../appendixa/file-shortdesc.xml">
diff --git a/entities/findutils.ent b/entities/findutils.ent
index b8681e86e..411b1ffe0 100644
--- a/entities/findutils.ent
+++ b/entities/findutils.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-findutils SYSTEM "../chapter05/findutils.xml">
-<!ENTITY c5-findutils-inst SYSTEM "../chapter05/findutils-inst.xml">
<!ENTITY c6-findutils SYSTEM "../chapter06/findutils.xml">
-<!ENTITY c6-findutils-inst SYSTEM "../chapter06/findutils-inst.xml">
<!ENTITY aa-findutils SYSTEM "../appendixa/findutils.xml">
<!ENTITY aa-findutils-shortdesc SYSTEM "../appendixa/findutils-shortdesc.xml">
diff --git a/entities/flex.ent b/entities/flex.ent
index 42eac46ca..2abc23e4d 100644
--- a/entities/flex.ent
+++ b/entities/flex.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-flex SYSTEM "../chapter06/flex.xml">
-<!ENTITY c6-flex-inst SYSTEM "../chapter06/flex-inst.xml">
<!ENTITY aa-flex SYSTEM "../appendixa/flex.xml">
<!ENTITY aa-flex-shortdesc SYSTEM "../appendixa/flex-shortdesc.xml">
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 91ecc2d12..8a653aeef 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-gawk SYSTEM "../chapter05/gawk.xml">
-<!ENTITY c5-gawk-inst SYSTEM "../chapter05/gawk-inst.xml">
<!ENTITY c6-gawk SYSTEM "../chapter06/gawk.xml">
-<!ENTITY c6-gawk-inst SYSTEM "../chapter06/gawk-inst.xml">
<!ENTITY aa-gawk SYSTEM "../appendixa/gawk.xml">
<!ENTITY aa-gawk-shortdesc SYSTEM "../appendixa/gawk-shortdesc.xml">
diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent
index bb2bb11a8..89e28da7d 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-gcc-2953 SYSTEM "../chapter06/gcc-2953.xml">
-<!ENTITY c6-gcc-2953-inst SYSTEM "../chapter06/gcc-2953-inst.xml">
<!ENTITY aa-gcc SYSTEM "../appendixa/gcc.xml">
<!ENTITY aa-gcc-shortdesc SYSTEM "../appendixa/gcc-shortdesc.xml">
diff --git a/entities/gcc.ent b/entities/gcc.ent
index bf6c48598..8021bd1d9 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -1,10 +1,7 @@
<!ENTITY c5-gcc-pass1 SYSTEM "../chapter05/gcc-pass1.xml">
-<!ENTITY c5-gcc-pass1-inst SYSTEM "../chapter05/gcc-pass1-inst.xml">
<!ENTITY c5-gcc-pass2 SYSTEM "../chapter05/gcc-pass2.xml">
-<!ENTITY c5-gcc-pass2-inst SYSTEM "../chapter05/gcc-pass2-inst.xml">
<!ENTITY c6-gcc SYSTEM "../chapter06/gcc.xml">
-<!ENTITY c6-gcc-inst SYSTEM "../chapter06/gcc-inst.xml">
<!ENTITY aa-gcc SYSTEM "../appendixa/gcc.xml">
<!ENTITY aa-gcc-shortdesc SYSTEM "../appendixa/gcc-shortdesc.xml">
diff --git a/entities/gettext.ent b/entities/gettext.ent
index 4e3131713..ae3b92d8a 100644
--- a/entities/gettext.ent
+++ b/entities/gettext.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-gettext SYSTEM "../chapter05/gettext.xml">
-<!ENTITY c5-gettext-inst SYSTEM "../chapter05/gettext-inst.xml">
<!ENTITY c6-gettext SYSTEM "../chapter06/gettext.xml">
-<!ENTITY c6-gettext-inst SYSTEM "../chapter06/gettext-inst.xml">
<!ENTITY aa-gettext SYSTEM "../appendixa/gettext.xml">
<!ENTITY aa-gettext-shortdesc SYSTEM "../appendixa/gettext-shortdesc.xml">
diff --git a/entities/glibc.ent b/entities/glibc.ent
index 012941e8d..022383b59 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-glibc SYSTEM "../chapter05/glibc.xml">
-<!ENTITY c5-glibc-inst SYSTEM "../chapter05/glibc-inst.xml">
<!ENTITY c6-glibc SYSTEM "../chapter06/glibc.xml">
-<!ENTITY c6-glibc-inst SYSTEM "../chapter06/glibc-inst.xml">
<!ENTITY c6-cf-glibc SYSTEM "../chapter06/config-glibc.xml">
<!ENTITY aa-glibc SYSTEM "../appendixa/glibc.xml">
diff --git a/entities/grep.ent b/entities/grep.ent
index eb94a4a9f..4d1ab2e50 100644
--- a/entities/grep.ent
+++ b/entities/grep.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-grep SYSTEM "../chapter05/grep.xml">
-<!ENTITY c5-grep-inst SYSTEM "../chapter05/grep-inst.xml">
<!ENTITY c6-grep SYSTEM "../chapter06/grep.xml">
-<!ENTITY c6-grep-inst SYSTEM "../chapter06/grep-inst.xml">
<!ENTITY aa-grep SYSTEM "../appendixa/grep.xml">
<!ENTITY aa-grep-shortdesc SYSTEM "../appendixa/grep-shortdesc.xml">
diff --git a/entities/groff.ent b/entities/groff.ent
index 38c590ab1..fb3ce6742 100644
--- a/entities/groff.ent
+++ b/entities/groff.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-groff SYSTEM "../chapter06/groff.xml">
-<!ENTITY c6-groff-inst SYSTEM "../chapter06/groff-inst.xml">
<!ENTITY aa-groff SYSTEM "../appendixa/groff.xml">
<!ENTITY aa-groff-shortdesc SYSTEM "../appendixa/groff-shortdesc.xml">
diff --git a/entities/grub.ent b/entities/grub.ent
index 6253159da..5cfa265e0 100644
--- a/entities/grub.ent
+++ b/entities/grub.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-grub SYSTEM "../chapter06/grub.xml">
-<!ENTITY c6-grub-inst SYSTEM "../chapter06/grub-inst.xml">
<!ENTITY aa-grub SYSTEM "../appendixa/grub.xml">
<!ENTITY aa-grub-shortdesc SYSTEM "../appendixa/grub-shortdesc.xml">
diff --git a/entities/gzip.ent b/entities/gzip.ent
index d90de814b..f5ba7d68b 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-gzip SYSTEM "../chapter05/gzip.xml">
-<!ENTITY c5-gzip-inst SYSTEM "../chapter05/gzip-inst.xml">
<!ENTITY c6-gzip SYSTEM "../chapter06/gzip.xml">
-<!ENTITY c6-gzip-inst SYSTEM "../chapter06/gzip-inst.xml">
<!ENTITY aa-gzip SYSTEM "../appendixa/gzip.xml">
<!ENTITY aa-gzip-shortdesc SYSTEM "../appendixa/gzip-shortdesc.xml">
diff --git a/entities/inetutils.ent b/entities/inetutils.ent
index 5ec1ddfcd..249b133c0 100644
--- a/entities/inetutils.ent
+++ b/entities/inetutils.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-inetutils SYSTEM "../chapter06/inetutils.xml">
-<!ENTITY c6-inetutils-inst SYSTEM "../chapter06/inetutils-inst.xml">
<!ENTITY aa-inetutils SYSTEM "../appendixa/inetutils.xml">
<!ENTITY aa-inetutils-shortdesc SYSTEM "../appendixa/inetutils-shortdesc.xml">
diff --git a/entities/kbd.ent b/entities/kbd.ent
index 5264ed9bf..33dd8a3ce 100644
--- a/entities/kbd.ent
+++ b/entities/kbd.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-kbd SYSTEM "../chapter06/kbd.xml">
-<!ENTITY c6-kbd-inst SYSTEM "../chapter06/kbd-inst.xml">
<!ENTITY aa-kbd SYSTEM "../appendixa/kbd.xml">
<!ENTITY aa-kbd-shortdesc SYSTEM "../appendixa/kbd-shortdesc.xml">
diff --git a/entities/less.ent b/entities/less.ent
index 87c1b8438..eca60260a 100644
--- a/entities/less.ent
+++ b/entities/less.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-less SYSTEM "../chapter06/less.xml">
-<!ENTITY c6-less-inst SYSTEM "../chapter06/less-inst.xml">
<!ENTITY aa-less SYSTEM "../appendixa/less.xml">
<!ENTITY aa-less-shortdesc SYSTEM "../appendixa/less-shortdesc.xml">
diff --git a/entities/lfs-utils.ent b/entities/lfs-utils.ent
index 5b584c432..15892a339 100644
--- a/entities/lfs-utils.ent
+++ b/entities/lfs-utils.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-lfs-utils SYSTEM "../chapter06/lfs-utils.xml">
-<!ENTITY c6-lfs-utils-inst SYSTEM "../chapter06/lfs-utils-inst.xml">
<!ENTITY aa-lfs-utils SYSTEM "../appendixa/lfs-utils.xml">
<!ENTITY aa-lfs-utils-shortdesc SYSTEM "../appendixa/lfs-utils-shortdesc.xml">
diff --git a/entities/libtool.ent b/entities/libtool.ent
index cc985185d..da5b0949d 100644
--- a/entities/libtool.ent
+++ b/entities/libtool.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-libtool SYSTEM "../chapter06/libtool.xml">
-<!ENTITY c6-libtool-inst SYSTEM "../chapter06/libtool-inst.xml">
<!ENTITY aa-libtool SYSTEM "../appendixa/libtool.xml">
<!ENTITY aa-libtool-shortdesc SYSTEM "../appendixa/libtool-shortdesc.xml">
diff --git a/entities/m4.ent b/entities/m4.ent
index ed72c6427..2987fbd69 100644
--- a/entities/m4.ent
+++ b/entities/m4.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-m4 SYSTEM "../chapter06/m4.xml">
-<!ENTITY c6-m4-inst SYSTEM "../chapter06/m4-inst.xml">
<!ENTITY aa-m4 SYSTEM "../appendixa/m4.xml">
<!ENTITY aa-m4-shortdesc SYSTEM "../appendixa/m4-shortdesc.xml">
diff --git a/entities/make.ent b/entities/make.ent
index acda40751..ed3beb5ca 100644
--- a/entities/make.ent
+++ b/entities/make.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-make SYSTEM "../chapter05/make.xml">
-<!ENTITY c5-make-inst SYSTEM "../chapter05/make-inst.xml">
<!ENTITY c6-make SYSTEM "../chapter06/make.xml">
-<!ENTITY c6-make-inst SYSTEM "../chapter06/make-inst.xml">
<!ENTITY aa-make SYSTEM "../appendixa/make.xml">
<!ENTITY aa-make-shortdesc SYSTEM "../appendixa/make-shortdesc.xml">
diff --git a/entities/makedev.ent b/entities/makedev.ent
index 50d65fa9b..cfc1e472c 100644
--- a/entities/makedev.ent
+++ b/entities/makedev.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-makedev SYSTEM "../chapter06/makedev.xml">
-<!ENTITY c6-makedev-inst SYSTEM "../chapter06/makedev-inst.xml">
<!ENTITY aa-makedev SYSTEM "../appendixa/makedev.xml">
<!ENTITY aa-makedev-shortdesc SYSTEM "../appendixa/makedev-shortdesc.xml">
diff --git a/entities/man.ent b/entities/man.ent
index e723845a2..c5b0b6a52 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-man SYSTEM "../chapter06/man.xml">
-<!ENTITY c6-man-inst SYSTEM "../chapter06/man-inst.xml">
<!ENTITY aa-man SYSTEM "../appendixa/man.xml">
<!ENTITY aa-man-shortdesc SYSTEM "../appendixa/man-shortdesc.xml">
diff --git a/entities/manpages.ent b/entities/manpages.ent
index 0463d5324..0a0472973 100644
--- a/entities/manpages.ent
+++ b/entities/manpages.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-manpages SYSTEM "../chapter06/manpages.xml">
-<!ENTITY c6-manpages-inst SYSTEM "../chapter06/manpages-inst.xml">
<!ENTITY aa-manpages SYSTEM "../appendixa/manpages.xml">
<!ENTITY aa-manpages-shortdesc SYSTEM "../appendixa/manpages-shortdesc.xml">
diff --git a/entities/modutils.ent b/entities/modutils.ent
index 0b75683ae..bb8b6668e 100644
--- a/entities/modutils.ent
+++ b/entities/modutils.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-modutils SYSTEM "../chapter06/modutils.xml">
-<!ENTITY c6-modutils-inst SYSTEM "../chapter06/modutils-inst.xml">
<!ENTITY aa-modutils SYSTEM "../appendixa/modutils.xml">
<!ENTITY aa-modutils-shortdesc SYSTEM "../appendixa/modutils-shortdesc.xml">
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index fc47dbd6d..03a35f21b 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-ncurses SYSTEM "../chapter05/ncurses.xml">
-<!ENTITY c5-ncurses-inst SYSTEM "../chapter05/ncurses-inst.xml">
<!ENTITY c6-ncurses SYSTEM "../chapter06/ncurses.xml">
-<!ENTITY c6-ncurses-inst SYSTEM "../chapter06/ncurses-inst.xml">
<!ENTITY aa-ncurses SYSTEM "../appendixa/ncurses.xml">
<!ENTITY aa-ncurses-shortdesc SYSTEM "../appendixa/ncurses-shortdesc.xml">
diff --git a/entities/nettools.ent b/entities/nettools.ent
index 664ba2b36..71184dc13 100644
--- a/entities/nettools.ent
+++ b/entities/nettools.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-nettools SYSTEM "../chapter06/nettools.xml">
-<!ENTITY c6-nettools-inst SYSTEM "../chapter06/nettools-inst.xml">
<!ENTITY aa-nettools SYSTEM "../appendixa/nettools.xml">
<!ENTITY aa-nettools-shortdesc SYSTEM "../appendixa/nettools-shortdesc.xml">
diff --git a/entities/patch.ent b/entities/patch.ent
index ea5855e06..5957c9446 100644
--- a/entities/patch.ent
+++ b/entities/patch.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-patch SYSTEM "../chapter05/patch.xml">
-<!ENTITY c5-patch-inst SYSTEM "../chapter05/patch-inst.xml">
<!ENTITY c6-patch SYSTEM "../chapter06/patch.xml">
-<!ENTITY c6-patch-inst SYSTEM "../chapter06/patch-inst.xml">
<!ENTITY aa-patch SYSTEM "../appendixa/patch.xml">
<!ENTITY aa-patch-shortdesc SYSTEM "../appendixa/patch-shortdesc.xml">
diff --git a/entities/perl.ent b/entities/perl.ent
index af7f73ce7..8b6506677 100644
--- a/entities/perl.ent
+++ b/entities/perl.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-perl SYSTEM "../chapter05/perl.xml">
-<!ENTITY c5-perl-inst SYSTEM "../chapter05/perl-inst.xml">
<!ENTITY c6-perl SYSTEM "../chapter06/perl.xml">
-<!ENTITY c6-perl-inst SYSTEM "../chapter06/perl-inst.xml">
<!ENTITY aa-perl SYSTEM "../appendixa/perl.xml">
<!ENTITY aa-perl-shortdesc SYSTEM "../appendixa/perl-shortdesc.xml">
diff --git a/entities/procinfo.ent b/entities/procinfo.ent
index a6b11252f..b6a8f0ed6 100644
--- a/entities/procinfo.ent
+++ b/entities/procinfo.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-procinfo SYSTEM "../chapter06/procinfo.xml">
-<!ENTITY c6-procinfo-inst SYSTEM "../chapter06/procinfo-inst.xml">
<!ENTITY aa-procinfo SYSTEM "../appendixa/procinfo.xml">
<!ENTITY aa-procinfo-shortdesc SYSTEM "../appendixa/procinfo-shortdesc.xml">
diff --git a/entities/procps.ent b/entities/procps.ent
index 571b8d609..7983052e5 100644
--- a/entities/procps.ent
+++ b/entities/procps.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-procps SYSTEM "../chapter06/procps.xml">
-<!ENTITY c6-procps-inst SYSTEM "../chapter06/procps-inst.xml">
<!ENTITY aa-procps SYSTEM "../appendixa/procps.xml">
<!ENTITY aa-procps-shortdesc SYSTEM "../appendixa/procps-shortdesc.xml">
diff --git a/entities/psmisc.ent b/entities/psmisc.ent
index 267d2b4ac..6909c3055 100644
--- a/entities/psmisc.ent
+++ b/entities/psmisc.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-psmisc SYSTEM "../chapter06/psmisc.xml">
-<!ENTITY c6-psmisc-inst SYSTEM "../chapter06/psmisc-inst.xml">
<!ENTITY aa-psmisc SYSTEM "../appendixa/psmisc.xml">
<!ENTITY aa-psmisc-shortdesc SYSTEM "../appendixa/psmisc-shortdesc.xml">
diff --git a/entities/sed.ent b/entities/sed.ent
index f1514e5b8..379cf2f10 100644
--- a/entities/sed.ent
+++ b/entities/sed.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-sed SYSTEM "../chapter05/sed.xml">
-<!ENTITY c5-sed-inst SYSTEM "../chapter05/sed-inst.xml">
<!ENTITY c6-sed SYSTEM "../chapter06/sed.xml">
-<!ENTITY c6-sed-inst SYSTEM "../chapter06/sed-inst.xml">
<!ENTITY aa-sed SYSTEM "../appendixa/sed.xml">
<!ENTITY aa-sed-shortdesc SYSTEM "../appendixa/sed-shortdesc.xml">
diff --git a/entities/shadow.ent b/entities/shadow.ent
index 7185c942b..987a1cd15 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-shadowpwd SYSTEM "../chapter06/shadowpwd.xml">
-<!ENTITY c6-shadowpwd-inst SYSTEM "../chapter06/shadowpwd-inst.xml">
<!ENTITY c6-cf-shadowpwd SYSTEM "../chapter06/config-shadowpwd.xml">
<!ENTITY aa-shadowpwd SYSTEM "../appendixa/shadowpwd.xml">
diff --git a/entities/sysklogd.ent b/entities/sysklogd.ent
index 8aaef1b25..060a10885 100644
--- a/entities/sysklogd.ent
+++ b/entities/sysklogd.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-sysklogd SYSTEM "../chapter06/sysklogd.xml">
-<!ENTITY c6-sysklogd-inst SYSTEM "../chapter06/sysklogd-inst.xml">
<!ENTITY c6-cf-sysklogd SYSTEM "../chapter06/config-sysklogd.xml">
<!ENTITY c7-sysklogd SYSTEM "../chapter07/sysklogd.xml">
diff --git a/entities/sysvinit.ent b/entities/sysvinit.ent
index cf7bbfc4d..5879da772 100644
--- a/entities/sysvinit.ent
+++ b/entities/sysvinit.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-sysvinit SYSTEM "../chapter06/sysvinit.xml">
-<!ENTITY c6-sysvinit-inst SYSTEM "../chapter06/sysvinit-inst.xml">
<!ENTITY c6-cf-sysvinit SYSTEM "../chapter06/config-sysvinit.xml">
<!ENTITY aa-sysvinit SYSTEM "../appendixa/sysvinit.xml">
diff --git a/entities/tar.ent b/entities/tar.ent
index 480a7c4a8..aeaea07b7 100644
--- a/entities/tar.ent
+++ b/entities/tar.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-tar SYSTEM "../chapter05/tar.xml">
-<!ENTITY c5-tar-inst SYSTEM "../chapter05/tar-inst.xml">
<!ENTITY c6-tar SYSTEM "../chapter06/tar.xml">
-<!ENTITY c6-tar-inst SYSTEM "../chapter06/tar-inst.xml">
<!ENTITY aa-tar SYSTEM "../appendixa/tar.xml">
<!ENTITY aa-tar-shortdesc SYSTEM "../appendixa/tar-shortdesc.xml">
diff --git a/entities/tcl.ent b/entities/tcl.ent
index d52eac882..8d93dd6f7 100644
--- a/entities/tcl.ent
+++ b/entities/tcl.ent
@@ -1,5 +1,4 @@
<!ENTITY c5-tcl SYSTEM "../chapter05/tcl.xml">
-<!ENTITY c5-tcl-inst SYSTEM "../chapter05/tcl-inst.xml">
<!ENTITY aa-tcl SYSTEM "../appendixa/tcl.xml">
<!ENTITY aa-tcl-shortdesc SYSTEM "../appendixa/tcl-shortdesc.xml">
diff --git a/entities/texinfo.ent b/entities/texinfo.ent
index 679de099c..217f4df43 100644
--- a/entities/texinfo.ent
+++ b/entities/texinfo.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-texinfo SYSTEM "../chapter05/texinfo.xml">
-<!ENTITY c5-texinfo-inst SYSTEM "../chapter05/texinfo-inst.xml">
<!ENTITY c6-texinfo SYSTEM "../chapter06/texinfo.xml">
-<!ENTITY c6-texinfo-inst SYSTEM "../chapter06/texinfo-inst.xml">
<!ENTITY aa-texinfo SYSTEM "../appendixa/texinfo.xml">
<!ENTITY aa-texinfo-shortdesc SYSTEM "../appendixa/texinfo-shortdesc.xml">
diff --git a/entities/utillinux.ent b/entities/utillinux.ent
index 8f828c582..514abc14f 100644
--- a/entities/utillinux.ent
+++ b/entities/utillinux.ent
@@ -1,8 +1,6 @@
<!ENTITY c5-utillinux SYSTEM "../chapter05/utillinux.xml">
-<!ENTITY c5-utillinux-inst SYSTEM "../chapter05/utillinux-inst.xml">
<!ENTITY c6-utillinux SYSTEM "../chapter06/utillinux.xml">
-<!ENTITY c6-utillinux-inst SYSTEM "../chapter06/utillinux-inst.xml">
<!ENTITY aa-utillinux SYSTEM "../appendixa/utillinux.xml">
<!ENTITY aa-utillinux-shortdesc SYSTEM "../appendixa/utillinux-shortdesc.xml">
diff --git a/entities/vim.ent b/entities/vim.ent
index b86780be8..44f066368 100644
--- a/entities/vim.ent
+++ b/entities/vim.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-vim SYSTEM "../chapter06/vim.xml">
-<!ENTITY c6-vim-inst SYSTEM "../chapter06/vim-inst.xml">
<!ENTITY c6-cf-vim SYSTEM "../chapter06/config-vim.xml">
<!ENTITY aa-vim SYSTEM "../appendixa/vim.xml">
diff --git a/entities/zlib.ent b/entities/zlib.ent
index 7363c7b3c..a405c9425 100644
--- a/entities/zlib.ent
+++ b/entities/zlib.ent
@@ -1,5 +1,4 @@
<!ENTITY c6-zlib SYSTEM "../chapter06/zlib.xml">
-<!ENTITY c6-zlib-inst SYSTEM "../chapter06/zlib-inst.xml">
<!ENTITY aa-zlib SYSTEM "../appendixa/zlib.xml">
<!ENTITY aa-zlib-shortdesc SYSTEM "../appendixa/zlib-shortdesc.xml">