浏览代码

Put Vim documentation directly into /usr/share/doc

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10613 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Chris Staub 11 年之前
父节点
当前提交
69f7600e2d
共有 2 个文件被更改,包括 29 次插入9 次删除
  1. 11 0
      chapter01/changelog.xml
  2. 18 9
      chapter06/vim.xml

+ 11 - 0
chapter01/changelog.xml

@@ -35,6 +35,17 @@
       </itemizedlist>
       </itemizedlist>
     </listitem>
     </listitem>
 -->
 -->
+    <listitem>
+      <para>2014-06-30</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Install Vim documentation to /usr/share/doc
+          instead of creating a symlink there. Fixes
+          <ulink url="&lfs-ticket-root;3617">#3617</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>2014-06-28</para>
       <para>2014-06-28</para>
       <itemizedlist>
       <itemizedlist>

+ 18 - 9
chapter06/vim.xml

@@ -83,7 +83,24 @@
 
 
     <para>Install the package:</para>
     <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
     <para>Many users are used to using <command>vi</command> instead of
     <command>vim</command>. To allow execution of <command>vim</command>
     <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
     ln -sv vim.1 $(dirname $L)/vi.1
 done</userinput></screen>
 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
     <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
     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
     comes with a GUI version of the editor that requires X and some