Changeset 3f81e97e

Timestamp:

Feb 21, 2006, 1:46:33 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

b17000e

Parents:

435fd531

Message:

r916@server (orig r914): ken | 2005-12-19 12:30:11 -0800
Resolve access to vim's help files, from LFS

Files:

• final-system/common/vim.xml (modified) (2 diffs)
• final-system/multilib/vim.xml (modified) (2 diffs)
• general.ent (modified) (2 diffs)
• introduction/common/changelog.xml (modified) (1 diff)

final-system/common/vim.xml

@@ -83 +83 @@
     <para os="i">Install the package:</para>
 
-<screen os="j"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
-
-    <variablelist os="k">
-      <title>The meaning of the make option:</title>
-
-      <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 os="j"><userinput>make install</userinput></screen>
 
     <para os="l">Many users are used to using <command>vi</command> instead of
@@ -110 +91 @@
 
 <screen os="m"><userinput>ln -s vim /usr/bin/vi</userinput></screen>
+
+<para os="m1">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 os="m2"><userinput>ln -sv /usr/share/vim/vim64/doc ../../../doc/vim-&vim-version;</userinput></screen>
 
     <para os="n">If an X Window System is going to be installed on the LFS

final-system/multilib/vim.xml

@@ -63 +63 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
@@ -72 +68 @@
     href="../common/vim.xml"
     xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

general.ent

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "CLFS-SVN-20051217">
+<!ENTITY version "CLFS-SVN-20051219">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
@@ -15 +15 @@
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "December 17, 2005">
+<!ENTITY releasedate "December 19, 2005">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->

introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>December 19, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix for accessing vim's documentation, from LFS.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 17, 2005</para>
       <itemizedlist>