Changeset 9587ab0f


Ignore:
Timestamp:
Aug 5, 2014, 1:45:41 AM (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/vim.xml

    r563e1e2 r9587ab0f  
    6464    <para os="j">Install the package:</para>
    6565
    66 <screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
     66<screen os="k"><userinput>make install</userinput></screen>
    6767
    6868    <para os="l">Many users are accustomed to using <command>vi</command>
     
    7575<screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
    7676
    77     <para os="n">If an X Window System is going to be installed on the CLFS
     77<para os="n">By default, Vim's documentation is installed in
     78<filename class="directory">/usr/share/vim</filename>.  The following symlink
     79allows the documentation to be accessed via
     80<filename class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
     81it consistent with the location of documentation for other packages:</para>
     82
     83<screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
     84
     85    <para os="p">If an X Window System is going to be installed on the CLFS
    7886    system, you may want to recompile Vim after installing X. Vim
    7987    comes with a GUI version of the editor that requires X and some
     
    141149    <segmentedlist>
    142150      <segtitle>Installed programs</segtitle>
    143       <segtitle>Installed directories</segtitle>
     151      <segtitle>Installed directory</segtitle>
    144152
    145153      <seglistitem>
     
    148156        tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
    149157        vimdiff (link to vim), vimm, vimspell.sh, vimtutor, xxd</seg>
    150         <seg>/usr/share/vim, /usr/share/doc/vim-&vim-version;</seg>
     158        <seg>/usr/share/vim</seg>
    151159      </seglistitem>
    152160    </segmentedlist>
  • BOOK/final-system/multilib/vim.xml

    r563e1e2 r9587ab0f  
    9090    xpointer="xpointer(//*[@os='n'])"/>
    9191
     92    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     93    href="../common/vim.xml"
     94    xpointer="xpointer(//*[@os='o'])"/>
     95
     96    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     97    href="../common/vim.xml"
     98    xpointer="xpointer(//*[@os='p'])"/>
     99
    92100  </sect2>
    93101
Note: See TracChangeset for help on using the changeset viewer.