Adapting the required disk space sizes.

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

24 files changed, 48 insertions, 48 deletions

diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 2c102e39b..8ea856ad1 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -2,8 +2,8 @@
 <title>Installing Bash-&bash-version;</title>
 <?dbhtml filename="bash.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &bash-time-static; 
-Estimated required disk space:  &bash-compsize-static;</screen>
+<screen>Estimated build time:           &bash-time-tools; 
+Estimated required disk space:  &bash-compsize-tools;</screen>
 
 &aa-bash-shortdesc;
 &aa-bash-dep;
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index ace0b932d..5f533f1dd 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -2,8 +2,8 @@
 <title>Installing Binutils-&binutils-version; - Pass 1</title>
 <?dbhtml filename="binutils-pass1.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &binutils-pass1-time-stage1;
-Estimated required disk space:  &binutils-pass1-compsize-stage1;</screen>
+<screen>Estimated build time:           &binutils-time-tools-pass1;
+Estimated required disk space:  &binutils-compsize-tools-pass1;</screen>
 
 &aa-binutils-shortdesc;
 &aa-binutils-dep;
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 0792ba9f2..3e9827b5f 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -2,8 +2,8 @@
 <title>Installing Binutils-&binutils-version; - Pass 2</title>
 <?dbhtml filename="binutils-pass2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &binutils-pass2-time-stage1;
-Estimated required disk space:  &binutils-pass2-compsize-stage1;</screen>
+<screen>Estimated build time:           &binutils-time-tools-pass2;
+Estimated required disk space:  &binutils-compsize-tools-pass2;</screen>
 
 &c5-binutils-pass2-inst;
 
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index 296bfec6b..9207f646d 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -2,8 +2,8 @@
 <title>Installing Bzip2-&bzip2-version;</title>
 <?dbhtml filename="bzip2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &bzip2-time-static;
-Estimated required disk space:  &bzip2-compsize-static;</screen>
+<screen>Estimated build time:           &bzip2-time-tools;
+Estimated required disk space:  &bzip2-compsize-tools;</screen>
 
 &aa-bzip2-shortdesc;
 &aa-bzip2-dep;
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 6cd9f28f6..17b3d3432 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Coreutils-&coreutils-version;</title>
 <?dbhtml filename="coreutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &coreutils-time-static;
-Estimated required disk space:  &coreutils-compsize-static;</screen>
+<screen>Estimated build time:           &coreutils-time-tools;
+Estimated required disk space:  &coreutils-compsize-tools;</screen>
 
 &aa-coreutils-shortdesc;
 &aa-coreutils-dep;
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index 832ef1f92..318eb1506 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -2,8 +2,8 @@
 <title>Installing DejaGnu-&dejagnu-version;</title>
 <?dbhtml filename="dejagnu.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &dejagnu-time-static; 
-Estimated required disk space:  &dejagnu-compsize-static;</screen>
+<screen>Estimated build time:           &dejagnu-time-tools; 
+Estimated required disk space:  &dejagnu-compsize-tools;</screen>
 
 &aa-dejagnu-shortdesc;
 &aa-dejagnu-dep;
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 3156c340c..75ef875e3 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Diffutils-&diffutils-version;</title>
 <?dbhtml filename="diffutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &diffutils-time-static;
-Estimated required disk space:  &diffutils-compsize-static;</screen>
+<screen>Estimated build time:           &diffutils-time-tools;
+Estimated required disk space:  &diffutils-compsize-tools;</screen>
 
 &aa-diffutils-shortdesc;
 &aa-diffutils-dep;
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 747b924cd..338d35537 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -2,8 +2,8 @@
 <title>Installing Expect-&expect-version;</title>
 <?dbhtml filename="expect.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &expect-time-static; 
-Estimated required disk space:  &expect-compsize-static;</screen>
+<screen>Estimated build time:           &expect-time-tools; 
+Estimated required disk space:  &expect-compsize-tools;</screen>
 
 &aa-expect-shortdesc;
 &aa-expect-dep;
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index 0ecaae958..04560c80d 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Findutils-&findutils-version;</title>
 <?dbhtml filename="findutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &findutils-time-static;
-Estimated required disk space:  &findutils-compsize-static;</screen>
+<screen>Estimated build time:           &findutils-time-tools;
+Estimated required disk space:  &findutils-compsize-tools;</screen>
 
 &aa-findutils-shortdesc;
 &aa-findutils-dep;
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index 76a1cba0e..37b042779 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -2,8 +2,8 @@
 <title>Installing Gawk-&gawk-version;</title>
 <?dbhtml filename="gawk.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gawk-time-static;
-Estimated required disk space:  &gawk-compsize-static;</screen>
+<screen>Estimated build time:           &gawk-time-tools;
+Estimated required disk space:  &gawk-compsize-tools;</screen>
 
 &aa-gawk-shortdesc;
 &aa-gawk-dep;
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 1fb44650f..42325708f 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -2,8 +2,8 @@
 <title>Installing GCC-&gcc-version; - Pass 1</title>
 <?dbhtml filename="gcc-pass1.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gcc-time-pass1-stage1;
-Estimated required disk space:  &gcc-compsize-pass1-stage1;</screen>
+<screen>Estimated build time:           &gcc-time-tools-pass1;
+Estimated required disk space:  &gcc-compsize-tools-pass1;</screen>
 
 &aa-gcc-shortdesc;
 &aa-gcc-dep;
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 6826f64a5..ad9b1892d 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -2,8 +2,8 @@
 <title>Installing GCC-&gcc-version; - Pass 2</title>
 <?dbhtml filename="gcc-pass2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gcc-time-pass2-stage1;
-Estimated required disk space:  &gcc-compsize-pass2-stage1;</screen>
+<screen>Estimated build time:           &gcc-time-tools-pass2;
+Estimated required disk space:  &gcc-compsize-tools-pass2;</screen>
 
 &c5-gcc-pass2-inst;
 
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 9195a3c1d..744a33213 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -2,8 +2,8 @@
 <title>Installing Gettext-&gettext-version;</title>
 <?dbhtml filename="gettext.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gettext-time;
-Estimated required disk space:  &gettext-compsize;</screen>
+<screen>Estimated build time:           &gettext-time-tools;
+Estimated required disk space:  &gettext-compsize-tools;</screen>
 
 &aa-gettext-shortdesc;
 &aa-gettext-dep;
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index f6ab886bd..1a2fa38aa 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -2,8 +2,8 @@
 <title>Installing Glibc-&glibc-version;</title>
 <?dbhtml filename="glibc.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &glibc-time;
-Estimated required disk space:  &glibc-compsize;</screen>
+<screen>Estimated build time:           &glibc-time-tools;
+Estimated required disk space:  &glibc-compsize-tools;</screen>
 
 &aa-glibc-shortdesc;
 &aa-glibc-dep;
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index dbb0e80cf..2003512b2 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -2,8 +2,8 @@
 <title>Installing Grep-&grep-version;</title>
 <?dbhtml filename="grep.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &grep-time-static;
-Estimated required disk space:  &grep-compsize-static;</screen>
+<screen>Estimated build time:           &grep-time-tools;
+Estimated required disk space:  &grep-compsize-tools;</screen>
 
 &aa-grep-shortdesc;
 &aa-grep-dep;
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 6d608ceb1..5211e69a6 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -2,8 +2,8 @@
 <title>Installing Gzip-&gzip-version;</title>
 <?dbhtml filename="gzip.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gzip-time-static;
-Estimated required disk space:  &gzip-compsize-static;</screen>
+<screen>Estimated build time:           &gzip-time-tools;
+Estimated required disk space:  &gzip-compsize-tools;</screen>
 
 &aa-gzip-shortdesc;
 &aa-gzip-dep;
diff --git a/chapter05/make.xml b/chapter05/make.xml
index ebb9331bb..1a51acc3b 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -2,8 +2,8 @@
 <title>Installing Make-&make-version;</title>
 <?dbhtml filename="make.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &make-time-static;
-Estimated required disk space:  &make-compsize-static;</screen>
+<screen>Estimated build time:           &make-time-tools;
+Estimated required disk space:  &make-compsize-tools;</screen>
 
 &aa-make-shortdesc;
 &aa-make-dep;
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index b36aafecb..b8c8a4465 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -2,8 +2,8 @@
 <title>Installing Ncurses-&ncurses-version;</title>
 <?dbhtml filename="ncurses.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &ncurses-time;
-Estimated required disk space:  &ncurses-compsize;</screen>
+<screen>Estimated build time:           &ncurses-time-tools;
+Estimated required disk space:  &ncurses-compsize-tools;</screen>
 
 &aa-ncurses-shortdesc;
 &aa-ncurses-dep;
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index c8d6b8d65..f2471acad 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -2,8 +2,8 @@
 <title>Installing Patch-&patch-version;</title>
 <?dbhtml filename="patch.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &patch-time-static;
-Estimated required disk space:  &patch-compsize-static;</screen>
+<screen>Estimated build time:           &patch-time-tools;
+Estimated required disk space:  &patch-compsize-tools;</screen>
 
 &aa-patch-shortdesc;
 &aa-patch-dep;
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index 2f0ceaee5..fe3c627d6 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -2,8 +2,8 @@
 <title>Installing Sed-&sed-version;</title>
 <?dbhtml filename="sed.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &sed-time-static;
-Estimated required disk space:  &sed-compsize-static;</screen>
+<screen>Estimated build time:           &sed-time-tools;
+Estimated required disk space:  &sed-compsize-tools;</screen>
 
 &aa-sed-shortdesc;
 &aa-sed-dep;
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 55c993836..1011e943a 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -2,8 +2,8 @@
 <title>Installing Tar-&tar-version;</title>
 <?dbhtml filename="tar.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &tar-time-static;
-Estimated required disk space:  &tar-compsize-static;</screen>
+<screen>Estimated build time:           &tar-time-tools;
+Estimated required disk space:  &tar-compsize-tools;</screen>
 
 &aa-tar-shortdesc;
 &aa-tar-dep;
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 8ababe922..1813c50b2 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -2,8 +2,8 @@
 <title>Installing Tcl-&tcl-version;</title>
 <?dbhtml filename="tcl.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &tcl-time-static; 
-Estimated required disk space:  &tcl-compsize-static;</screen>
+<screen>Estimated build time:           &tcl-time-tools; 
+Estimated required disk space:  &tcl-compsize-tools;</screen>
 
 &aa-tcl-shortdesc;
 &aa-tcl-dep;
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index fdbf5f83c..53a4beaff 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -2,8 +2,8 @@
 <title>Installing Texinfo-&texinfo-version;</title>
 <?dbhtml filename="texinfo.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &texinfo-time-static;
-Estimated required disk space:  &texinfo-compsize-static;</screen>
+<screen>Estimated build time:           &texinfo-time-tools;
+Estimated required disk space:  &texinfo-compsize-tools;</screen>
 
 &aa-texinfo-shortdesc;
 &aa-texinfo-dep;
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index 059dca15b..0e0d7ff05 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -2,8 +2,8 @@
 <title>Installing Util-linux-&util-linux-version;</title>
 <?dbhtml filename="util-linux.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &util-linux-time-static;
-Estimated required disk space:  &util-linux-compsize-static;</screen>
+<screen>Estimated build time:           &util-linux-time-tools;
+Estimated required disk space:  &util-linux-compsize-tools;</screen>
 
 &aa-utillinux-shortdesc;
 &aa-utillinux-dep;