Small entity cleanups.

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

9 files changed, 13 insertions, 13 deletions

diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 43c99423a..15dc47cc1 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -36,7 +36,7 @@ achieve this easily, you could do something like:
 
 <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput>../binutils-&binutils-version;/configure \
+<screen><userinput>../&binutils-dir;/configure \
 &nbsp;&nbsp;&nbsp;&nbsp;--prefix=/tools --disable-nls</userinput></screen>
 
 <para>The meaning of the configure options:</para>
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 7617470c4..5b521f033 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -21,7 +21,7 @@ cd ../binutils-build</userinput></screen>
 
 <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
+<screen><userinput>../&binutils-dir;/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>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index c994e7650..a0d4af5c7 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -32,7 +32,7 @@ cd ../gcc-build</userinput></screen>
 
 <para>Prepare GCC for compilation:</para>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
+<screen><userinput>../&gcc-dir;/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>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 8cd11d026..762ce0d17 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -37,7 +37,7 @@ get PTYs working.</para>
 <para>This time we will build both the C and the C++ compilers, so you'll have
 to 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>
+<filename>&gcc-dir;/</filename> subdirectory.</para>
 
 <para>First correct one problem and make an essential adjustment:</para>
 
@@ -77,7 +77,7 @@ variables that override the default optimization flags.</para>
 
 <para>Now prepare GCC for compilation:</para>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
+<screen><userinput>../&gcc-dir;/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 \
@@ -128,7 +128,7 @@ 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>
+<screen><userinput>../&gcc-dir;/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
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 02f771868..8a95589ac 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -49,7 +49,7 @@ cd ../binutils-build</userinput></screen>
 
 <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput>../binutils-&binutils-version;/configure \
+<screen><userinput>../&binutils-dir;/configure \
 &nbsp;&nbsp;&nbsp;&nbsp;--prefix=/usr --enable-shared</userinput></screen>
 
 <para>Compile the package:</para>
@@ -79,7 +79,7 @@ doubts.</para>
 <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>
+<screen><userinput>cp ../&binutils-dir;/include/libiberty.h /usr/include</userinput></screen>
 
 </sect2>
 
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 93f58ba04..ed22a5389 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -24,7 +24,7 @@ cd ../e2fsprogs-build</userinput></screen>
 
 <para>Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput>../e2fsprogs-&e2fsprogs-version;/configure --prefix=/usr --with-root-prefix="" \
+<screen><userinput>../&e2fsprogs-dir;/configure --prefix=/usr --with-root-prefix="" \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-elf-shlibs</userinput></screen>
 
 <para>The meaning of the configure options:</para>
diff --git a/chapter06/gcc-2953.xml b/chapter06/gcc-2953.xml
index 4e967285f..0afb56167 100644
--- a/chapter06/gcc-2953.xml
+++ b/chapter06/gcc-2953.xml
@@ -59,7 +59,7 @@ cd ../gcc-2-build</userinput></screen>
 
 <para>Compile and install the compiler:</para>
 
-<screen><userinput>../gcc-2.95.3/configure --prefix=/opt/gcc-2.95.3 \
+<screen><userinput>../&gcc-2953-dir;/configure --prefix=/opt/&gcc-2953-dir; \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-languages=c \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix
 make bootstrap
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 9609b8713..f234fd891 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -58,7 +58,7 @@ cd ../gcc-build</userinput></screen>
 
 <para>Now prepare GCC for compilation:</para>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
+<screen><userinput>../&gcc-dir;/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>
diff --git a/index.xml b/index.xml
index 20c519abf..17d1f717b 100644
--- a/index.xml
+++ b/index.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-2004-01-21">
-<!ENTITY releasedate "January 21st, 2004">
+<!ENTITY version "CVS-2004-01-22">
+<!ENTITY releasedate "January 22nd, 2004">
 <!ENTITY milestone "5.1">
 <!ENTITY nbsp " ">