Changeset 9587ab0f for BOOK

Timestamp:

Aug 5, 2014, 1:45:41 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, master, systemd

Children:

81534d2

Parents:

563e1e2

Message:

Revert "Remove link for installed documentation and install documentation into the proper place with HELPSUBLOC variable during make install."

This reverts commit 906f724c28419a6465567fa94057cef558109f4f.

Conflicts:

BOOK/final-system/common/vim.xml

Location:

BOOK/final-system

Files:

• common/vim.xml (modified) (4 diffs)
• multilib/vim.xml (modified) (1 diff)

BOOK/final-system/common/vim.xml

@@ -64 +64 @@
     <para os="j">Install the package:</para>
 
-<screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
 
     <para os="l">Many users are accustomed to using <command>vi</command>
@@ -75 +75 @@
 <screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
 
-    <para os="n">If an X Window System is going to be installed on the CLFS
+<para os="n">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="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
+
+    <para os="p">If an X Window System is going to be installed on the CLFS
     system, you may want to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
@@ -141 +149 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
@@ -148 +156 @@
         tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
         vimdiff (link to vim), vimm, vimspell.sh, vimtutor, xxd</seg>
-        <seg>/usr/share/vim, /usr/share/doc/vim-&vim-version;</seg>
+        <seg>/usr/share/vim</seg>
       </seglistitem>
     </segmentedlist>

BOOK/final-system/multilib/vim.xml

@@ -90 +90 @@
     xpointer="xpointer(//*[@os='n'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
   </sect2>