Replace hard-wired version numbers with entities where appropriate.

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

7 files changed, 15 insertions, 15 deletions

diff --git a/appendixa/gawk-shortdesc.xml b/appendixa/gawk-shortdesc.xml
index 52095c913..200b114d8 100644
--- a/appendixa/gawk-shortdesc.xml
+++ b/appendixa/gawk-shortdesc.xml
@@ -5,7 +5,7 @@
 <para>Gawk is an awk implementation that is used to manipulate text
 files.</para>
 
-<para><emphasis>Installed programs</emphasis>: awk, gawk, gawk-3.1.1, grcat,
-igawk, pgawk, pgawk-3.1.1 and pwcat</para>
+<para><emphasis>Installed programs</emphasis>: awk, gawk, gawk-&gawk-version;,
+grcat, igawk, pgawk, pgawk-&gawk-version; and pwcat</para>
 
 </sect2>
diff --git a/appendixa/perl-shortdesc.xml b/appendixa/perl-shortdesc.xml
index 8b412d010..68770ccb9 100644
--- a/appendixa/perl-shortdesc.xml
+++ b/appendixa/perl-shortdesc.xml
@@ -7,8 +7,8 @@ and Report Language. Perl combines some of the best features of C,
 sed, awk and sh into one powerful language.</para>
 
 <para><emphasis>Installed programs</emphasis>: a2p, c2ph, dprofpp, enc2xs,
-find2perl, h2ph, h2xs, libnetcfg, perl, perl5.8.0 (link to perl), perlbug,
-perlcc, perldoc, perlivp, piconv, pl2pm, pod2html, pod2latex, pod2man,
+find2perl, h2ph, h2xs, libnetcfg, perl, perl&perl-version; (link to perl),
+perlbug, perlcc, perldoc, perlivp, piconv, pl2pm, pod2html, pod2latex, pod2man,
 pod2text, pod2usage, podchecker, podselect, psed (link to s2p), pstruct (link
 to c2ph), s2p, splain and xsubpp</para> 
 
diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml
index 49666276b..08b3b6d33 100644
--- a/chapter05/gcc-pass2-inst.xml
+++ b/chapter05/gcc-pass2-inst.xml
@@ -120,7 +120,7 @@ a summary of the test suite results, run this:</para>
 
 <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-3.3.1 should look on i686-pc-linux-gnu, see
+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>
diff --git a/chapter05/glibc-inst.xml b/chapter05/glibc-inst.xml
index fcf891cba..02da2d905 100644
--- a/chapter05/glibc-inst.xml
+++ b/chapter05/glibc-inst.xml
@@ -28,7 +28,7 @@ Fix this annoying little error 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 3.3.1.
+<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>
diff --git a/chapter05/perl-inst.xml b/chapter05/perl-inst.xml
index 65467b194..8b996c447 100644
--- a/chapter05/perl-inst.xml
+++ b/chapter05/perl-inst.xml
@@ -22,8 +22,8 @@ echo 'static_ext="IO re Fcntl"' >> hints/linux.sh</userinput></screen>
 <para>Then copy these tools and their libraries:</para>
 
 <screen><userinput>cp perl pod/pod2man /tools/bin
-mkdir -p /tools/lib/perl5/5.8.0
-cp -R lib/* /tools/lib/perl5/5.8.0</userinput></screen>
+mkdir -p /tools/lib/perl5/&perl-version;
+cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
 
 </sect2>
 
diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml
index d57ac539c..b3eeafcb7 100644
--- a/chapter06/gawk-inst.xml
+++ b/chapter06/gawk-inst.xml
@@ -20,14 +20,14 @@ the book).</para></listitem>
 
 <listitem><para>The default data directory for gawk is <filename
 class="directory">$prefix/share/awk</filename>. A package specific
-directory should be named using the package and version (like gawk-3.1.3
-instead of awk) because there may be more than one awk interpreter on a
-system (and more than one version of gawk). The patch changes this to
-<filename class="directory">$prefix/share/gawk-3.1.3</filename> to be more
-correct.</para></listitem>
+directory should be named using the package and version (like
+gawk-&gawk-version; instead of awk) because there may be more than one awk
+interpreter on a system (and more than one version of gawk). The patch changes
+this to <filename class="directory">$prefix/share/gawk-&gawk-version;</filename>
+to be more correct.</para></listitem>
 
 <listitem><para>The patch ensures that this directory (<filename
-class="directory">$prefix/share/gawk-3.1.3</filename>) is removed along
+class="directory">$prefix/share/gawk-&gawk-version;</filename>) is removed along
 with its contents on a make uninstall.</para></listitem>
 </itemizedlist>
 
diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml
index d92791cbe..748de1fbc 100644
--- a/chapter06/grub-inst.xml
+++ b/chapter06/grub-inst.xml
@@ -9,7 +9,7 @@ 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-3.3.1</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>