aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/autoconf.xml4
-rw-r--r--chapter06/automake.xml4
-rw-r--r--chapter06/bash.xml4
-rw-r--r--chapter06/binutils.xml4
-rw-r--r--chapter06/bison.xml4
-rw-r--r--chapter06/bootscripts.xml4
-rw-r--r--chapter06/bzip2.xml4
-rw-r--r--chapter06/coreutils.xml4
-rw-r--r--chapter06/diffutils.xml4
-rw-r--r--chapter06/e2fsprogs.xml4
-rw-r--r--chapter06/ed.xml4
-rw-r--r--chapter06/file.xml4
-rw-r--r--chapter06/findutils.xml4
-rw-r--r--chapter06/flex.xml4
-rw-r--r--chapter06/gawk.xml4
-rw-r--r--chapter06/gcc-2953.xml4
-rw-r--r--chapter06/gcc.xml4
-rw-r--r--chapter06/gettext.xml4
-rw-r--r--chapter06/glibc.xml4
-rw-r--r--chapter06/grep.xml4
-rw-r--r--chapter06/groff.xml4
-rw-r--r--chapter06/grub.xml4
-rw-r--r--chapter06/gzip.xml4
-rw-r--r--chapter06/inetutils.xml4
-rw-r--r--chapter06/kbd.xml4
-rw-r--r--chapter06/kernel.xml4
-rw-r--r--chapter06/less.xml4
-rw-r--r--chapter06/lfs-utils.xml4
-rw-r--r--chapter06/libtool.xml4
-rw-r--r--chapter06/m4.xml4
-rw-r--r--chapter06/make.xml4
-rw-r--r--chapter06/makedev.xml4
-rw-r--r--chapter06/man.xml4
-rw-r--r--chapter06/manpages.xml4
-rw-r--r--chapter06/modutils.xml4
-rw-r--r--chapter06/ncurses.xml4
-rw-r--r--chapter06/nettools.xml4
-rw-r--r--chapter06/patch.xml4
-rw-r--r--chapter06/perl.xml4
-rw-r--r--chapter06/procinfo.xml4
-rw-r--r--chapter06/procps.xml4
-rw-r--r--chapter06/psmisc.xml4
-rw-r--r--chapter06/sed.xml4
-rw-r--r--chapter06/shadowpwd.xml4
-rw-r--r--chapter06/sysklogd.xml4
-rw-r--r--chapter06/sysvinit.xml4
-rw-r--r--chapter06/tar.xml4
-rw-r--r--chapter06/texinfo.xml4
-rw-r--r--chapter06/utillinux.xml4
-rw-r--r--chapter06/vim.xml4
-rw-r--r--chapter06/zlib.xml4
51 files changed, 102 insertions, 102 deletions
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 315936118..5ec83dfc4 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -5,8 +5,8 @@
<para>The Autoconf package contains programs for producing shell scripts that
can automatically configure source code.</para>
-<screen>Estimated build time: &autoconf-time;
-Estimated required disk space: &autoconf-compsize;</screen>
+<screen>&buildtime; &autoconf-time;
+&diskspace; &autoconf-compsize;</screen>
&aa-autoconf-down;
&aa-autoconf-dep;
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index cf7f3a294..570373dde 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -5,8 +5,8 @@
<para>The Automake package contains programs for generating Makefiles for use
with Autoconf.</para>
-<screen>Estimated build time: &automake-time;
-Estimated required disk space: &automake-compsize;</screen>
+<screen>&buildtime; &automake-time;
+&diskspace; &automake-compsize;</screen>
&aa-automake-down;
&aa-automake-dep;
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 52e95dace..320eb06df 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -4,8 +4,8 @@
<para>The Bash package contains the Bourne-Again SHell.</para>
-<screen>Estimated build time: &bash-time;
-Estimated required disk space: &bash-compsize;</screen>
+<screen>&buildtime; &bash-time;
+&diskspace; &bash-compsize;</screen>
&aa-bash-down;
&aa-bash-dep;
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 8a95589ac..5ace5b155 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -5,8 +5,8 @@
<para>The Binutils package contains a linker, an assembler, and other tools for
handling object files.</para>
-<screen>Estimated build time: &binutils-time;
-Estimated required disk space: &binutils-compsize;</screen>
+<screen>&buildtime; &binutils-time;
+&diskspace; &binutils-compsize;</screen>
&aa-binutils-down;
&aa-binutils-dep;
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 17e298523..73ac90be5 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -4,8 +4,8 @@
<para>The Bison package contains a parser generator.</para>
-<screen>Estimated build time: &bison-time;
-Estimated required disk space: &bison-compsize;</screen>
+<screen>&buildtime; &bison-time;
+&diskspace; &bison-compsize;</screen>
&aa-bison-down;
&aa-bison-dep;
diff --git a/chapter06/bootscripts.xml b/chapter06/bootscripts.xml
index fe9b32d83..e26fefba2 100644
--- a/chapter06/bootscripts.xml
+++ b/chapter06/bootscripts.xml
@@ -4,8 +4,8 @@
<para>The LFS-Bootscripts package contains a set of bootscripts.</para>
-<screen>Estimated build time: &bootscripts-time;
-Estimated required disk space: &bootscripts-compsize;</screen>
+<screen>&buildtime; &bootscripts-time;
+&diskspace; &bootscripts-compsize;</screen>
&aa-bootscripts-down;
&aa-bootscripts-dep;
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index da427ce5c..39a8207ce 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -6,8 +6,8 @@
files. On text files they achieve a much better compression than the
traditional <userinput>gzip</userinput>.</para>
-<screen>Estimated build time: &bzip2-time;
-Estimated required disk space: &bzip2-compsize;</screen>
+<screen>&buildtime; &bzip2-time;
+&diskspace; &bzip2-compsize;</screen>
&aa-bzip2-down;
&aa-bzip2-dep;
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 10ebcf631..8e1ab5faa 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -5,8 +5,8 @@
<para>The Coreutils package contains utilities for showing and setting the
basic system characteristics.</para>
-<screen>Estimated build time: &coreutils-time;
-Estimated required disk space: &coreutils-compsize;</screen>
+<screen>&buildtime; &coreutils-time;
+&diskspace; &coreutils-compsize;</screen>
&aa-coreutils-down;
&aa-coreutils-dep;
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 9222ac3d6..9d89b2f39 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -5,8 +5,8 @@
<para>The Diffutils package contains programs that show the differences
between files or directories.</para>
-<screen>Estimated build time: &diffutils-time;
-Estimated required disk space: &diffutils-compsize;</screen>
+<screen>&buildtime; &diffutils-time;
+&diskspace; &diffutils-compsize;</screen>
&aa-diffutils-down;
&aa-diffutils-dep;
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index ed22a5389..f8904de39 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -5,8 +5,8 @@
<para>The E2fsprogs package contains the utilities for handling the ext2
filesystem. It also supports the ext3 journaling filesystem.</para>
-<screen>Estimated build time: &e2fsprogs-time;
-Estimated required disk space: &e2fsprogs-compsize;</screen>
+<screen>&buildtime; &e2fsprogs-time;
+&diskspace; &e2fsprogs-compsize;</screen>
&aa-e2fsprogs-down;
&aa-e2fsprogs-dep;
diff --git a/chapter06/ed.xml b/chapter06/ed.xml
index 489571e20..b240ef281 100644
--- a/chapter06/ed.xml
+++ b/chapter06/ed.xml
@@ -4,8 +4,8 @@
<para>The Ed package contains a spartan line editor.</para>
-<screen>Estimated build time: &ed-time;
-Estimated required disk space: &ed-compsize;</screen>
+<screen>&buildtime; &ed-time;
+&diskspace; &ed-compsize;</screen>
&aa-ed-down;
&aa-ed-dep;
diff --git a/chapter06/file.xml b/chapter06/file.xml
index ad992f8a6..cd37b589b 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -4,8 +4,8 @@
<para>The File package contains a utility for determining the type of files.</para>
-<screen>Estimated build time: &file-time;
-Estimated required disk space: &file-compsize;</screen>
+<screen>&buildtime; &file-time;
+&diskspace; &file-compsize;</screen>
&aa-file-down;
&aa-file-dep;
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 1041a20ab..236f78a9e 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -6,8 +6,8 @@
done either by doing a live recursive search through a directory tree, or by
consulting a previously set up database.</para>
-<screen>Estimated build time: &findutils-time;
-Estimated required disk space: &findutils-compsize;</screen>
+<screen>&buildtime; &findutils-time;
+&diskspace; &findutils-compsize;</screen>
&aa-findutils-down;
&aa-findutils-dep;
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index e4e8c51b1..64bd2068f 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -5,8 +5,8 @@
<para>The Flex package contains a utility for generating programs that
recognize patterns in text.</para>
-<screen>Estimated build time: &flex-time;
-Estimated required disk space: &flex-compsize;</screen>
+<screen>&buildtime; &flex-time;
+&diskspace; &flex-compsize;</screen>
&aa-flex-down;
&aa-flex-dep;
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index cd6755d04..8a1c3eecc 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -4,8 +4,8 @@
<para>The Gawk package contains programs for manipulating text files.</para>
-<screen>Estimated build time: &gawk-time;
-Estimated required disk space: &gawk-compsize;</screen>
+<screen>&buildtime; &gawk-time;
+&diskspace; &gawk-compsize;</screen>
&aa-gawk-down;
&aa-gawk-dep;
diff --git a/chapter06/gcc-2953.xml b/chapter06/gcc-2953.xml
index 0afb56167..19f7aa18b 100644
--- a/chapter06/gcc-2953.xml
+++ b/chapter06/gcc-2953.xml
@@ -2,8 +2,8 @@
<title>Installing GCC-2.95.3</title>
<?dbhtml filename="gcc-2953.html" dir="chapter06"?>
-<screen>Estimated build time: &gcc-2953-time;
-Estimated required disk space: &gcc-2953-compsize;</screen>
+<screen>&buildtime; &gcc-2953-time;
+&diskspace; &gcc-2953-compsize;</screen>
<sect2><title></title>
<literallayout>Official download location for GCC-2 (&gcc-2953-version;):
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index f234fd891..b6d311e36 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -5,8 +5,8 @@
<para>The GCC package contains the GNU compiler collection, among them
the C and C++ compilers.</para>
-<screen>Estimated build time: &gcc-time;
-Estimated required disk space: &gcc-compsize;</screen>
+<screen>&buildtime; &gcc-time;
+&diskspace; &gcc-compsize;</screen>
<literallayout>Official download location for GCC (&gcc-version;):
<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index e8ae88eca..fc8afca68 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -6,8 +6,8 @@
localization. These allow programs to be compiled with Native Language Support
(NLS), enabling them to output messages in the user's native language.</para>
-<screen>Estimated build time: &gettext-time;
-Estimated required disk space: &gettext-compsize;</screen>
+<screen>&buildtime; &gettext-time;
+&diskspace; &gettext-compsize;</screen>
&aa-gettext-down;
&aa-gettext-dep;
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 1a1cce808..abe6647d2 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -7,8 +7,8 @@ the basic routines for allocating memory, searching directories, opening and
closing files, reading and writing them, string handling, pattern matching,
arithmetic, and so on.</para>
-<screen>Estimated build time: &glibc-time;
-Estimated required disk space: &glibc-compsize;</screen>
+<screen>&buildtime; &glibc-time;
+&diskspace; &glibc-compsize;</screen>
&aa-glibc-down;
&aa-glibc-dep;
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 771b21deb..55e33e16f 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -4,8 +4,8 @@
<para>The Grep package contains programs for searching through files.</para>
-<screen>Estimated build time: &grep-time;
-Estimated required disk space: &grep-compsize;</screen>
+<screen>&buildtime; &grep-time;
+&diskspace; &grep-compsize;</screen>
&aa-grep-down;
&aa-grep-dep;
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 18cfbcbde..39fa8bc1c 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -4,8 +4,8 @@
<para>The Groff package contains programs for processing and formatting text.</para>
-<screen>Estimated build time: &groff-time;
-Estimated required disk space: &groff-compsize;</screen>
+<screen>&buildtime; &groff-time;
+&diskspace; &groff-compsize;</screen>
&aa-groff-down;
&aa-groff-dep;
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index cf31362e2..e51073d04 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -4,8 +4,8 @@
<para>The Grub package contains the GRand Unified Bootloader.</para>
-<screen>Estimated build time: &grub-time;
-Estimated required disk space: &grub-compsize;</screen>
+<screen>&buildtime; &grub-time;
+&diskspace; &grub-compsize;</screen>
&aa-grub-down;
&aa-grub-dep;
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 295c4a6c8..ba5d19083 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -5,8 +5,8 @@
<para>The Gzip package contains programs for compressing and decompressing
files.</para>
-<screen>Estimated build time: &gzip-time;
-Estimated required disk space: &gzip-compsize;</screen>
+<screen>&buildtime; &gzip-time;
+&diskspace; &gzip-compsize;</screen>
&aa-gzip-down;
&aa-gzip-dep;
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index d78416bcd..4dfb7edbd 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -4,8 +4,8 @@
<para>The Inetutils package contains programs for basic networking.</para>
-<screen>Estimated build time: &inetutils-time;
-Estimated required disk space: &inetutils-compsize;</screen>
+<screen>&buildtime; &inetutils-time;
+&diskspace; &inetutils-compsize;</screen>
&aa-inetutils-down;
&aa-inetutils-dep;
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index bb39ab2e3..a3c5a6a5d 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -4,8 +4,8 @@
<para>The Kbd package contains keytable files and keyboard utilities.</para>
-<screen>Estimated build time: &kbd-time;
-Estimated required disk space: &kbd-compsize;</screen>
+<screen>&buildtime; &kbd-time;
+&diskspace; &kbd-compsize;</screen>
&aa-kbd-down;
&aa-kbd-dep;
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index 91f4cbaee..bcc993747 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -2,8 +2,8 @@
<title>Installing Linux-&kernel-version; headers</title>
<?dbhtml filename="kernel.html" dir="chapter06"?>
-<screen>Estimated build time: &kernel-time-headers;
-Estimated required disk space: &kernel-compsize-headers;</screen>
+<screen>&buildtime; &kernel-time-headers;
+&diskspace; &kernel-compsize-headers;</screen>
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
diff --git a/chapter06/less.xml b/chapter06/less.xml
index fd6bac9bc..4806ea701 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -4,8 +4,8 @@
<para>The Less package contains a text file viewer.</para>
-<screen>Estimated build time: &less-time;
-Estimated required disk space: &less-compsize;</screen>
+<screen>&buildtime; &less-time;
+&diskspace; &less-compsize;</screen>
&aa-less-down;
&aa-less-dep;
diff --git a/chapter06/lfs-utils.xml b/chapter06/lfs-utils.xml
index 282a79fc6..0d329b764 100644
--- a/chapter06/lfs-utils.xml
+++ b/chapter06/lfs-utils.xml
@@ -4,8 +4,8 @@
<para>The Lfs-Utils package contains a few helper files.</para>
-<screen>Estimated build time: &lfs-utils-time;
-Estimated required disk space: &lfs-utils-compsize;</screen>
+<screen>&buildtime; &lfs-utils-time;
+&diskspace; &lfs-utils-compsize;</screen>
&aa-lfs-utils-down;
&aa-lfs-utils-dep;
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 112107ee3..af0ede375 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -6,8 +6,8 @@
It wraps the complexity of using shared libraries in a consistent, portable
interface.</para>
-<screen>Estimated build time: &libtool-time;
-Estimated required disk space: &libtool-compsize;</screen>
+<screen>&buildtime; &libtool-time;
+&diskspace; &libtool-compsize;</screen>
&aa-libtool-down;
&aa-libtool-dep;
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 84bfc8400..a01f4d8c8 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -4,8 +4,8 @@
<para>The M4 package contains a macro processor.</para>
-<screen>Estimated build time: &m4-time;
-Estimated required disk space: &m4-compsize;</screen>
+<screen>&buildtime; &m4-time;
+&diskspace; &m4-compsize;</screen>
&aa-m4-down;
&aa-m4-dep;
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 346a5dc12..626b574d2 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -4,8 +4,8 @@
<para>The Make package contains a program for compiling large packages.</para>
-<screen>Estimated build time: &make-time;
-Estimated required disk space: &make-compsize;</screen>
+<screen>&buildtime; &make-time;
+&diskspace; &make-compsize;</screen>
&aa-make-down;
&aa-make-dep;
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index 8a828cec5..320aa9057 100644
--- a/chapter06/makedev.xml
+++ b/chapter06/makedev.xml
@@ -4,8 +4,8 @@
<para>The MAKEDEV package contains a script for making device nodes.</para>
-<screen>Estimated build time: &makedev-time;
-Estimated required disk space: &makedev-compsize;</screen>
+<screen>&buildtime; &makedev-time;
+&diskspace; &makedev-compsize;</screen>
&aa-makedev-down;
&aa-makedev-dep;
diff --git a/chapter06/man.xml b/chapter06/man.xml
index a031c5273..2f370f01a 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -4,8 +4,8 @@
<para>The Man package contains programs for finding and viewing manual pages.</para>
-<screen>Estimated build time: &man-time;
-Estimated required disk space: &man-compsize;</screen>
+<screen>&buildtime; &man-time;
+&diskspace; &man-compsize;</screen>
&aa-man-down;
&aa-man-dep;
diff --git a/chapter06/manpages.xml b/chapter06/manpages.xml
index c0f4fc979..e80d6ecb6 100644
--- a/chapter06/manpages.xml
+++ b/chapter06/manpages.xml
@@ -4,8 +4,8 @@
<para>The Man-pages package contains over 1200 manual pages.</para>
-<screen>Estimated build time: &man-pages-time;
-Estimated required disk space: &man-pages-compsize;</screen>
+<screen>&buildtime; &man-pages-time;
+&diskspace; &man-pages-compsize;</screen>
&aa-manpages-down;
&aa-manpages-dep;
diff --git a/chapter06/modutils.xml b/chapter06/modutils.xml
index 2103a4f19..99408f65a 100644
--- a/chapter06/modutils.xml
+++ b/chapter06/modutils.xml
@@ -4,8 +4,8 @@
<para>The Modutils package contains programs for handling kernel modules.</para>
-<screen>Estimated build time: &modutils-time;
-Estimated required disk space: &modutils-compsize;</screen>
+<screen>&buildtime; &modutils-time;
+&diskspace; &modutils-compsize;</screen>
&aa-modutils-down;
&aa-modutils-dep;
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 0b044b362..c824b4bac 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -5,8 +5,8 @@
<para>The Ncurses package contains libraries for the terminal-independent
handling of character screens.</para>
-<screen>Estimated build time: &ncurses-time;
-Estimated required disk space: &ncurses-compsize;</screen>
+<screen>&buildtime; &ncurses-time;
+&diskspace; &ncurses-compsize;</screen>
&aa-ncurses-down;
&aa-ncurses-dep;
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index e846df1cc..47ddf958a 100644
--- a/chapter06/nettools.xml
+++ b/chapter06/nettools.xml
@@ -4,8 +4,8 @@
<para>The Net-tools package contains programs for basic networking.</para>
-<screen>Estimated build time: &net-tools-time;
-Estimated required disk space: &net-tools-compsize;</screen>
+<screen>&buildtime; &net-tools-time;
+&diskspace; &net-tools-compsize;</screen>
&aa-nettools-down;
&aa-nettools-dep;
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index 1692c4d70..d1e5b2bf5 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -4,8 +4,8 @@
<para>The Patch package contains a program for modifying files.</para>
-<screen>Estimated build time: &patch-time;
-Estimated required disk space: &patch-compsize;</screen>
+<screen>&buildtime; &patch-time;
+&diskspace; &patch-compsize;</screen>
&aa-patch-down;
&aa-patch-dep;
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index e96ce49d0..761e433a1 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -4,8 +4,8 @@
<para>The Perl package contains the Practical Extraction and Report Language.</para>
-<screen>Estimated build time: &perl-time;
-Estimated required disk space: &perl-compsize;</screen>
+<screen>&buildtime; &perl-time;
+&diskspace; &perl-compsize;</screen>
<literallayout>Official download location for Perl (&perl-version;):
<ulink url="http://www.perl.com/"/></literallayout>
diff --git a/chapter06/procinfo.xml b/chapter06/procinfo.xml
index cb3e097ea..443d5a4d0 100644
--- a/chapter06/procinfo.xml
+++ b/chapter06/procinfo.xml
@@ -4,8 +4,8 @@
<para>The Procinfo package contains programs for displaying system information.</para>
-<screen>Estimated build time: &procinfo-time;
-Estimated required disk space: &procinfo-compsize;</screen>
+<screen>&buildtime; &procinfo-time;
+&diskspace; &procinfo-compsize;</screen>
&aa-procinfo-down;
&aa-procinfo-dep;
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index a5e8864d8..c823617b0 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -4,8 +4,8 @@
<para>The Procps package contains programs for monitoring processes.</para>
-<screen>Estimated build time: &procps-time;
-Estimated required disk space: &procps-compsize;</screen>
+<screen>&buildtime; &procps-time;
+&diskspace; &procps-compsize;</screen>
&aa-procps-down;
&aa-procps-dep;
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index 307d0252c..18d5425b2 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -5,8 +5,8 @@
<para>The Psmisc package contains programs for displaying information on
processes.</para>
-<screen>Estimated build time: &psmisc-time;
-Estimated required disk space: &psmisc-compsize;</screen>
+<screen>&buildtime; &psmisc-time;
+&diskspace; &psmisc-compsize;</screen>
&aa-psmisc-down;
&aa-psmisc-dep;
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 2e684a89a..77e822c6b 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -4,8 +4,8 @@
<para>The Sed package contains a stream editor.</para>
-<screen>Estimated build time: &sed-time;
-Estimated required disk space: &sed-compsize;</screen>
+<screen>&buildtime; &sed-time;
+&diskspace; &sed-compsize;</screen>
&aa-sed-down;
&aa-sed-dep;
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index a89df4002..d63adc7f6 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadowpwd.xml
@@ -5,8 +5,8 @@
<para>The Shadow package contains programs for handling passwords in a secure
way.</para>
-<screen>Estimated build time: &shadow-time;
-Estimated required disk space: &shadow-compsize;</screen>
+<screen>&buildtime; &shadow-time;
+&diskspace; &shadow-compsize;</screen>
&aa-shadowpwd-down;
&aa-shadowpwd-dep;
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 9a472bf4c..98a94bc26 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -5,8 +5,8 @@
<para>The Sysklogd package contains programs for logging system messages, such
as those given by the kernel when unusual things happen.</para>
-<screen>Estimated build time: &sysklogd-time;
-Estimated required disk space: &sysklogd-compsize;</screen>
+<screen>&buildtime; &sysklogd-time;
+&diskspace; &sysklogd-compsize;</screen>
&aa-sysklogd-down;
&aa-sysklogd-dep;
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 4ff4cf791..f25cfdf27 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -5,8 +5,8 @@
<para>The Sysvinit package contains programs for controlling the startup,
running, and shutdown of your system.</para>
-<screen>Estimated build time: &sysvinit-time;
-Estimated required disk space: &sysvinit-compsize;</screen>
+<screen>&buildtime; &sysvinit-time;
+&diskspace; &sysvinit-compsize;</screen>
&aa-sysvinit-down;
&aa-sysvinit-dep;
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 310411b52..131d7c84a 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -4,8 +4,8 @@
<para>The Tar package contains an archiving program.</para>
-<screen>Estimated build time: &tar-time;
-Estimated required disk space: &tar-compsize;</screen>
+<screen>&buildtime; &tar-time;
+&diskspace; &tar-compsize;</screen>
&aa-tar-down;
&aa-tar-dep;
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 1884a7080..45a416ce3 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -5,8 +5,8 @@
<para>The Texinfo package contains programs for reading, writing, and
converting Info documents.</para>
-<screen>Estimated build time: &texinfo-time;
-Estimated required disk space: &texinfo-compsize;</screen>
+<screen>&buildtime; &texinfo-time;
+&diskspace; &texinfo-compsize;</screen>
&aa-texinfo-down;
&aa-texinfo-dep;
diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml
index 1ff0bb410..655c3d5c2 100644
--- a/chapter06/utillinux.xml
+++ b/chapter06/utillinux.xml
@@ -6,8 +6,8 @@
them are utilities for handling filesystems, consoles, partitions, and
messages.</para>
-<screen>Estimated build time: &util-linux-time;
-Estimated required disk space: &util-linux-compsize;</screen>
+<screen>&buildtime; &util-linux-time;
+&diskspace; &util-linux-compsize;</screen>
&aa-utillinux-down;
&aa-utillinux-dep;
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index e4ab8dba2..fcd6e9b96 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -4,8 +4,8 @@
<para>The Vim package contains a powerful text editor.</para>
-<screen>Estimated build time: &vim-time;
-Estimated required disk space: &vim-compsize;</screen>
+<screen>&buildtime; &vim-time;
+&diskspace; &vim-compsize;</screen>
&aa-vim-down;
&aa-vim-dep;
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index e0b63e3ec..a3527a819 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -5,8 +5,8 @@
<para>The Zlib package contains compression and uncompression routines used by
some programs.</para>
-<screen>Estimated build time: &zlib-time;
-Estimated required disk space: &zlib-compsize;</screen>
+<screen>&buildtime; &zlib-time;
+&diskspace; &zlib-compsize;</screen>
&aa-zlib-down;
&aa-zlib-dep;