From 69f7600e2d2df3674ac662f98724f35c27704c2e Mon Sep 17 00:00:00 2001
From: Chris Staub <chris@linuxfromscratch.org>
Date: Mon, 30 Jun 2014 06:05:57 +0000
Subject: Put Vim documentation directly into /usr/share/doc

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10613 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/vim.xml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index c5b3d0527..d400249be 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -83,7 +83,24 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>HELPSUBLOC=/usr/share/doc/vim-&vim-version;</parameter></term>
+        <listitem>
+          <para>Tells Vim to install its documentation into
+          <filename class="directory">/usr/share/doc/vim-&vim-version;</filename>
+          instead of 
+          <filename class="directory">/usr/share/&vim-docdir;/doc</filename>,
+          for better consistency with the documentation location for other
+          packages.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <para>Many users are used to using <command>vi</command> instead of
     <command>vim</command>. To allow execution of <command>vim</command>
@@ -96,14 +113,6 @@ for L in  /usr/share/man/{,*/}man1/vim.1; do
     ln -sv vim.1 $(dirname $L)/vi.1
 done</userinput></screen>
 
-    <para>By default, Vim's documentation is installed in <filename
-    class="directory">/usr/share/vim</filename>. The following symlink
-    allows the documentation to be accessed via <filename
-    class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
-    it consistent with the location of documentation for other packages:</para>
-
-<screen><userinput remap="install">ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
-
     <para>If an X Window System is going to be installed on the LFS
     system, it may be necessary to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
-- 
cgit v1.2.3-54-g00ecf