aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter06/vim.xml28
2 files changed, 14 insertions, 19 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9356e9346..1eef53355 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -119,6 +119,11 @@ allowing us to drop its source directory right away. Origin is Greg Schafer, and
Dan Nicholson for the report (fixes bug 1670).</para>
</listitem>
+<listitem><para>December 17, 2005 [matt]: Symlink Vim's documentation to
+/usr/share/doc. Fixes bug 1610. Thanks to Randy McMurchy for the original
+report and to Ken and Jeremy for their investigations into the fix.</para>
+</listitem>
+
<listitem><para>December 17, 2005 [matt]: Upgrade to psmisc-21.9</para>
</listitem>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 768632561..6fa6eb85d 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -73,25 +73,7 @@ redirecting the output to a log file.</para>
<para>Install the package:</para>
-<screen><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
-
-<para>The meaning of the make option:</para>
-
-<variablelist>
- <varlistentry>
- <term><parameter>HELPSUBLOC=/usr/share/doc/vim-&vim-version;</parameter>
- </term>
- <listitem>
- <para>This defines the directory that Vim's documentation will be
- installed in. By default, Vim's documentation is installed in the
- <filename class="directory">/usr/share/vim</filename> hierarchy. Other
- packages install their documentation in the
- <filename class="directory">/usr/share/doc</filename> hierarchy, so the
- <parameter>HELPSUBLOC</parameter> option is used to ensure consistency.
- </para>
- </listitem>
- </varlistentry>
-</variablelist>
+<screen><userinput>make install</userinput></screen>
<para>Many users are used to using <command>vi</command> instead of
<command>vim</command>. To allow execution of <command>vim</command>
@@ -100,6 +82,14 @@ symlink:</para>
<screen><userinput>ln -sv vim /usr/bin/vi</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>ln -sv /usr/share/vim/vim64/doc ../../../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