Bugs 44, 64 and 320

Update to: diffutils-2.8, modutils-2.4.15, vim-6.1
See chapter01/changelog.xml for details of changes to install procedures
(only diffutils and vim instructions were changed; modutils is same)


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

3 files changed, 3 insertions, 28 deletions

diff --git a/chapter06/diffutils-inst.xml b/chapter06/diffutils-inst.xml
index b8d1f0646..67f279bd9 100644
--- a/chapter06/diffutils-inst.xml
+++ b/chapter06/diffutils-inst.xml
@@ -4,7 +4,7 @@
 <para>Install Diffutils by running the following commands:</para>
 
 <para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make PR_PROGRAM=/usr/bin/pr &amp;&amp;
+make &amp;&amp;
 make install</userinput></screen></para>
 
 </sect2>
diff --git a/chapter06/vim-exp.xml b/chapter06/vim-exp.xml
index 9a4167468..62af4675a 100644
--- a/chapter06/vim-exp.xml
+++ b/chapter06/vim-exp.xml
@@ -1,11 +1,6 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>sed '/shUntil\|link shRepeat/{...:</userinput> This sed
-command fixes a bug in the <filename>syntax/sh.vim</filename> file that
-will cause an error message when you edit a shell script using syntax
-highlighting.</para>
-
 <para><userinput>make
 CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\":</userinput> Setting this will
 cause vim to look for the <filename>/etc/vimrc</filename> file that
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index a4a73002d..8bf39c1c3 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -9,17 +9,7 @@ which are currently available are for Emacs, Joe and nano.</para>
 
 <para>Install Vim by running the following commands:</para>
 
-<para><screen><userinput>cp runtime/syntax/sh.vim runtime/syntax/sh.vim.backup &amp;&amp;
-sed '/shUntil\|link shRepeat/{
-&nbsp;&nbsp;&nbsp;/shUntil/N
-&nbsp;&nbsp;&nbsp;/^/i\
-&nbsp;&nbsp;&nbsp;if exists("b:is_kornshell") || exists("b:is_bash")
-&nbsp;&nbsp;&nbsp;p
-&nbsp;&nbsp;&nbsp;/$/i\
-&nbsp;&nbsp;&nbsp;endif
-&nbsp;&nbsp;&nbsp;d
-&nbsp;&nbsp;&nbsp;}' runtime/syntax/sh.vim.backup &gt; runtime/syntax/sh.vim &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
 cd /usr/bin &amp;&amp;
@@ -41,17 +31,7 @@ for their temporary state files, like temporary save files for example.
 If you wish vim to conform to the FHS, you should use this command set 
 instead of the one presented above:</para>
 
-<para><screen><userinput>cp runtime/syntax/sh.vim runtime/syntax/sh.vim.backup &amp;&amp;
-sed '/shUntil\|link shRepeat/{
-&nbsp;&nbsp;&nbsp;/shUntil/N
-&nbsp;&nbsp;&nbsp;/^/i\
-&nbsp;&nbsp;&nbsp;if exists("b:is_kornshell") || exists("b:is_bash")
-&nbsp;&nbsp;&nbsp;p
-&nbsp;&nbsp;&nbsp;/$/i\
-&nbsp;&nbsp;&nbsp;endif
-&nbsp;&nbsp;&nbsp;d
-&nbsp;&nbsp;&nbsp;}' runtime/syntax/sh.vim.backup &gt; runtime/syntax/sh.vim &amp;&amp;
-./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
 cd /usr/bin &amp;&amp;