From 0dbaee7c4d10a1090c64f21d9b8042d948e67766 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Thu, 9 Aug 2001 01:00:41 +0000
Subject: Changed vim's default global vimrc file location to /etc

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@947 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/vim-inst.xml | 13 ++++++++-----
 chapter06/vim.xml      |  1 +
 index.xml              |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index e61ec90cb..382404739 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -4,16 +4,17 @@
 <para>If you don't like vim to be installed as an editor on the LFS system,
 you may want to download an alternative and install an editor you 
 prefer. There are a few hints how to install different editors
-available at <ulink
-url="&hint-root;">&hint-root;</ulink>
-.  The hints which are currently available are for Emacs, Joe and nano.</para>
+available at <ulink url="&hint-root;">&hint-root;</ulink>.  The hints 
+which are currently available are for Emacs, Joe and nano.</para>
 
 <para>Both the vim-rt and vim-src packages need to be unpacked to install Vim.
 Both packages will unpack their files into the vim-&vim-version; directory. This
 won't overwrite any files from the other package. So it doesn't matter
 in which order it is done. Install Vim by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
+<para><screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; \
+&nbsp;&nbsp;&nbsp;src/feature.h</userinput>
+<userinput>./configure --prefix=/usr &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>cd /usr/bin &amp;&amp;</userinput>
@@ -35,7 +36,9 @@ 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>./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;</userinput>
+<para><screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; \
+&nbsp;&nbsp;&nbsp;src/feature.h</userinput>
+<userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>cd /usr/bin &amp;&amp;</userinput>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 6b50ee8dc..dd8b7c96a 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -5,6 +5,7 @@
 Estimated disk space required:  &vim-compsize;</screen>
 
 &c6-vim-inst;
+&c6-vim-exp;
 &aa-vim-desc;
 
 </sect1>
diff --git a/index.xml b/index.xml
index 8231fd29f..4f15d5012 100644
--- a/index.xml
+++ b/index.xml
@@ -290,6 +290,7 @@
 <!ENTITY c6-textutils-inst SYSTEM "chapter6/textutils-inst.xml">
 <!ENTITY c6-vim SYSTEM "chapter6/vim.xml">
 <!ENTITY c6-vim-inst SYSTEM "chapter6/vim-inst.xml">
+<!ENTITY c6-vim-exp SYSTEM "chapter6/vim-exp.xml">
 <!ENTITY c6-utillinux SYSTEM "chapter6/utillinux.xml">
 <!ENTITY c6-utillinux-inst SYSTEM "chapter6/utillinux-inst.xml">
 <!ENTITY c6-utillinux-exp SYSTEM "chapter6/utillinux-exp.xml">
-- 
cgit v1.2.3-54-g00ecf