r646 - in trunk/BOOK: final-system/common final-system/multilib introduction/common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Nov 7 11:58:49 PST 2005


Author: manuel
Date: 2005-11-07 12:58:49 -0700 (Mon, 07 Nov 2005)
New Revision: 646

Modified:
   trunk/BOOK/final-system/common/vim.xml
   trunk/BOOK/final-system/multilib/vim.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
Fixed Vim's documentation installation.

Modified: trunk/BOOK/final-system/common/vim.xml
===================================================================
--- trunk/BOOK/final-system/common/vim.xml	2005-11-07 19:31:37 UTC (rev 645)
+++ trunk/BOOK/final-system/common/vim.xml	2005-11-07 19:58:49 UTC (rev 646)
@@ -94,8 +94,27 @@
 
     <para os="j">Install the package:</para>
 
-<screen os="k"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
 
+    <variablelist os="k1">
+      <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>
+
     <para os="l">Many users are used to using <command>vi</command> instead of
     <command>vim</command>. To allow execution of <command>vim</command>
     when users habitually enter <command>vi</command>, create a

Modified: trunk/BOOK/final-system/multilib/vim.xml
===================================================================
--- trunk/BOOK/final-system/multilib/vim.xml	2005-11-07 19:31:37 UTC (rev 645)
+++ trunk/BOOK/final-system/multilib/vim.xml	2005-11-07 19:58:49 UTC (rev 646)
@@ -87,6 +87,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='k1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-11-07 19:31:37 UTC (rev 645)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-11-07 19:58:49 UTC (rev 646)
@@ -29,10 +29,10 @@
       <para>Date</para>
       <itemizedlist>
         <listitem>
-          <para>[name] - Changelog entry.</para>
+          <para>[name] - New changelog entry.</para>
         </listitem>
         <listitem>
-          <para>[name] - Another changelog entry.</para>
+          <para>[name] - Previous changelog entry.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -42,8 +42,14 @@
       <para>November 7, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[manuel] - Install Vim's documentation to <filename
+          class="directory">/usr/share/doc/vim-&vim-version;</filename> instead
+          of <filename class="directory">/usr/share/vim/vim64/doc</filename>.
+          Ported from LFS-SVN.</para>
+        </listitem>
+        <listitem>
           <para>[manuel] - Correct the instructions for running the
-          Mudule-Init-Tools' testsuite.</para>
+          Mudule-Init-Tools' testsuite. Ported from LFS-SVN.</para>
         </listitem>
       </itemizedlist>
     </listitem>




More information about the cross-lfs mailing list