Bringing order to the presentation of patches.

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

14 files changed, 21 insertions, 21 deletions

diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml
index 308a2dbea..339a670df 100644
--- a/chapter06/bash-inst.xml
+++ b/chapter06/bash-inst.xml
@@ -7,7 +7,7 @@
 way it is expected at times. Fix this behaviour with the following
 patch:</para>
 
-<para><screen><userinput>patch -Np1 -i ../bash-&bash-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&bash-patch;</userinput></screen></para>
 
 <para>Prepare Bash for compilation:</para>
 
diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml
index 665caa7c6..7ef5a0a09 100644
--- a/chapter06/coreutils-inst.xml
+++ b/chapter06/coreutils-inst.xml
@@ -7,13 +7,13 @@
 broken, in that the <userinput>-p</userinput> switch always returns "unknown".
 The following patch fixes this behaviour for Intel architectures:</para>
 
-<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen></para>
 
 <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>
 
-<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-hostname-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&coreutils-hostname-patch;</userinput></screen></para>
 
 <para>Now prepare Coreutils for compilation:</para>
 
diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml
index 0fa6d4d48..0cfe4f261 100644
--- a/chapter06/ed-inst.xml
+++ b/chapter06/ed-inst.xml
@@ -17,7 +17,7 @@ create temporary files.</para>
 
 <para>Apply the patch:</para>
 
-<para><screen><userinput>patch -Np1 -i ../ed-&ed-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&ed-patch;</userinput></screen></para>
 
 <para>Now prepare Ed for compilation:</para>
 
diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml
index 1ac6525be..b804ef845 100644
--- a/chapter06/gawk-inst.xml
+++ b/chapter06/gawk-inst.xml
@@ -31,7 +31,7 @@ class="directory">$prefix/share/gawk-3.1.3</filename>) is removed along
 with its contents on a make uninstall.</para></listitem>
 </itemizedlist>
 
-<para><screen><userinput>patch -Np1 -i ../gawk-&gawk-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&gawk-patch;</userinput></screen></para>
 
 <para>Now prepare Gawk for compilation:</para>
 
diff --git a/chapter06/gcc-2953-inst.xml b/chapter06/gcc-2953-inst.xml
index e6531b560..3af7c987e 100644
--- a/chapter06/gcc-2953-inst.xml
+++ b/chapter06/gcc-2953-inst.xml
@@ -27,9 +27,9 @@ the system GCC already installed in <filename class="directory">/usr</filename>
 
 <para>Apply the patches and make a small adjustment:</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-2953-patch-version;.patch
-patch -Np1 -i ../gcc-&gcc-2953-no-fixinc-patch-version;.patch
-patch -Np1 -i ../gcc-&gcc-2953-returntype-fix-patch-version;.patch
+<para><screen><userinput>patch -Np1 -i ../&gcc-2953-patch;.patch
+patch -Np1 -i ../&gcc-2953-no-fixinc-patch;.patch
+patch -Np1 -i ../&gcc-2953-returntype-fix-patch;.patch
 echo timestamp > gcc/cstamp-h.in</userinput></screen></para>
 
 <para>The GCC documentation recommends building GCC outside of the source
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 2be07056c..35e49751d 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -20,8 +20,8 @@ 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>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-nofixincludes-patch-version;.patch
-patch -Np1 -i ../gcc-&gcc-suppress-libiberty-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;
+patch -Np1 -i ../&gcc-suppress-libiberty-patch;</userinput></screen></para>
 
 <para>The second patch here suppresses the installation of libiberty from GCC,
 as we will use the one provided by binutils instead. Be careful
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index 95e6db1e4..9ac69ac01 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -20,7 +20,7 @@ flags.</para>
 
 <para>Then apply the same patch we used previously:</para>
                                                                                 
-<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-sscanf-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&glibc-sscanf-patch;</userinput></screen></para>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml
index 650b76c0b..66ec995b0 100644
--- a/chapter06/grub-inst.xml
+++ b/chapter06/grub-inst.xml
@@ -11,7 +11,7 @@ Grub.</para>
 
 <para>Grub needs a patch to fix a compilation problem with GCC-3.3.1</para>
 
-<para><screen><userinput>patch -Np1 -i ../grub-&grub-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&grub-patch;</userinput></screen></para>
 
 <para>Prepare Grub for compilation:</para>
 
diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml
index 80ad275d6..e27d55b94 100644
--- a/chapter06/kbd-inst.xml
+++ b/chapter06/kbd-inst.xml
@@ -7,7 +7,7 @@
 <userinput>setvesablank</userinput> and <userinput>getunimap</userinput>) are
 not installed . The patch enables the compilation of these utilities:</para>
 
-<para><screen><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&kbd-patch;</userinput></screen></para>
 
 <para>Now prepare Kbd for compilation:</para>
 
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index 958cce200..830ba1532 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -9,19 +9,19 @@
 <filename>man.conf</filename> file to prevent redundant results when using
  programs such as <userinput>whatis</userinput>:</para>
 
-<para><screen><userinput>patch -Np1 -i ../man-&man-manpath-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&man-manpath-patch;</userinput></screen></para>
 
 <para>The second patch adds the <emphasis>-R</emphasis> option to the
 <emphasis>PAGER</emphasis> variable so that escape sequences are
 handled properly:</para>
 
-<para><screen><userinput>patch -Np1 -i ../man-&man-pager-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&man-pager-patch;</userinput></screen></para>
 
 <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>
 
-<para><screen><userinput>patch -Np1 -i ../man-&man-80cols-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&man-80cols-patch;</userinput></screen></para>
 
 <para>Now prepare Man for compilation:</para>
 
diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml
index 26cc70588..251a901c8 100644
--- a/chapter06/ncurses-inst.xml
+++ b/chapter06/ncurses-inst.xml
@@ -5,8 +5,8 @@
 
 <para>First fix two tiny bugs:</para>
 
-<para><screen><userinput>patch -Np1 -i ../ncurses-&ncurses-version;-etip-2.patch
-patch -Np1 -i ../ncurses-&ncurses-version;-vsscanf.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;
+patch -Np1 -i ../&ncurses-vsscanf-patch;</userinput></screen></para>
 
 <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
diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml
index 508b5ad42..3e8aa1035 100644
--- a/chapter06/procps-inst.xml
+++ b/chapter06/procps-inst.xml
@@ -6,7 +6,7 @@
 <para>First fix a locale problem that can crash <userinput>w</userinput> under
 certain locale settings:</para>
 
-<para><screen><userinput>patch -Np1 -i ../procps-&procps-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&procps-patch;</userinput></screen></para>
 
 <para>Now compile Procps:</para>
 
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 9e0069145..4fc389869 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -39,7 +39,7 @@ the package incorrectly assumes it is going to be located at
 it to fail.  The following patch (also appearing in Shadow's CVS code) fixes
 this problem.</para>
 
-<para><screen><userinput>patch -Np1 -i ../shadow-&shadow-patch-version;.patch
+<para><screen><userinput>patch -Np1 -i ../&shadow-patch;.patch
 </userinput></screen></para>
 
 <para>Now prepare Shadow for compilation:</para>
diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml
index 21cd9bc7d..bef73c94c 100644
--- a/chapter06/zlib-inst.xml
+++ b/chapter06/zlib-inst.xml
@@ -7,7 +7,7 @@
 <emphasis>gzprintf()</emphasis> function, that, though difficult to take
 advantage of, should be taken care of by applying this patch:</para>
 
-<para><screen><userinput>patch -Np1 -i ../zlib-&zlib-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&zlib-patch;</userinput></screen></para>
 
 <para>Now prepare Zlib for compilation:</para>