Changeset 0d81e3c

Timestamp:

08/05/2014 11:51:34 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

49a92553

Parents:

075d0290

Message:

Undo change to Vim docs, so that Vim can find them

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10677 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/vim.xml (modified) (4 diffs)

chapter01/changelog.xml

@@ -36 +36 @@
     </listitem>
 -->
+    <listitem>
+      <para>2014-08-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Reversed change to Vim's docs location, so that
+          Vim can find its help files.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-08-03</para>

chapter06/vim.xml

@@ -84 +84 @@
     <para>Install the package:</para>
 
-<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>
+<screen><userinput remap="install">make install</userinput></screen>
 
     <para>Many users are used to using <command>vi</command> instead of
@@ -113 +96 @@
     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
@@ -196 +187 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
@@ -202 +193 @@
        (link to vim), view (link to vim), vim, vimdiff (link to vim), vimtutor,
        and xxd</seg>
-        <seg>/usr/share/doc/vim-&vim-version;, /usr/share/vim</seg>
+        <seg>/usr/share/vim</seg>
       </seglistitem>
     </segmentedlist>