From f5ab23e287e91a6f1bcaf77c5da82775bfc3d64c Mon Sep 17 00:00:00 2001 From: Timothy Bauscher Date: Thu, 16 Jan 2003 03:37:28 +0000 Subject: [PATCH] Converted vim to new layout. Added an Alternatives section. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2351 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/vim-alt.xml | 13 +++++++++++++ appendixa/vim-dep.xml | 2 ++ appendixa/vim-desc.xml | 12 ++++-------- appendixa/vim-shortdesc.xml | 14 ++++++++++++++ appendixa/vim.xml | 2 ++ chapter06/vim-inst.xml | 37 ++++++++++++++++++++++++++----------- chapter06/vim.xml | 6 +++--- entities/gawk.ent | 1 - entities/vim.ent | 4 +++- 9 files changed, 67 insertions(+), 24 deletions(-) create mode 100644 appendixa/vim-alt.xml create mode 100644 appendixa/vim-shortdesc.xml diff --git a/appendixa/vim-alt.xml b/appendixa/vim-alt.xml new file mode 100644 index 000000000..d1fe508b7 --- /dev/null +++ b/appendixa/vim-alt.xml @@ -0,0 +1,13 @@ + +Alternatives to Vim + + + + + emacs, joe and nano + + + + + + diff --git a/appendixa/vim-dep.xml b/appendixa/vim-dep.xml index dc73c1c51..defe63785 100644 --- a/appendixa/vim-dep.xml +++ b/appendixa/vim-dep.xml @@ -1,3 +1,5 @@ +   + Vim Installation Dependencies diff --git a/appendixa/vim-desc.xml b/appendixa/vim-desc.xml index 496c854f2..e252ecff9 100644 --- a/appendixa/vim-desc.xml +++ b/appendixa/vim-desc.xml @@ -1,14 +1,10 @@ -Contents of Vim +   + +Descriptions Last checked against version &vim-contversion;. -Program Files -efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk, -pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl, -tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl, -vimdiff (link to vim), vimm, vimspell.sh, vimtutor and xxd - -Descriptions +Program file descriptions efm_filter.pl efm_filter.pl is a filter which reads from stdin, copies to diff --git a/appendixa/vim-shortdesc.xml b/appendixa/vim-shortdesc.xml new file mode 100644 index 000000000..29c6062f0 --- /dev/null +++ b/appendixa/vim-shortdesc.xml @@ -0,0 +1,14 @@ +Contents of Vim + +Last checked against version &vim-contversion;. + +The Vim package contains a configurable text editor built to +enable efficient text editing. + +Program Files +efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk, +pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl, +tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl, +vimdiff (link to vim), vimm, vimspell.sh, vimtutor and xxd + + diff --git a/appendixa/vim.xml b/appendixa/vim.xml index 69a91968e..37d5c5894 100644 --- a/appendixa/vim.xml +++ b/appendixa/vim.xml @@ -3,6 +3,8 @@ &aa-vim-down; +&aa-vim-shortdesc; +&aa-vim-alt; &aa-vim-desc; &aa-vim-dep; diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index 0e8ad5590..85de1eb4d 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -1,21 +1,36 @@ +   + Installation of Vim This package requires its patch to be applied before you can -install it. +install it. This patch fixes a compile problem with GCC-3.2. Apply +the patch by issuing the following command: -If you not wish to install Vim, build instructions for -alternative editors are available at -. -Currently, there are instructions for Emacs, nano, and joe. +patch -Np1 -i ../vim-&vim-patch-version;.patch -Install Vim by running the following commands: +Prepare Vim to be compiled: -patch -Np1 -i ../vim-&vim-patch-version;.patch && -./configure --prefix=/usr && -make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" && -make install && -ln -s vim /usr/bin/vi +./configure --prefix=/usr + +Continue with compiling the package: + +make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" + +The CPPFLAGS option above causes vim to look +for the /etc/vimrc file which contains vim's global settings. Normally, +this file is assumed to be located in /usr/share/vim, +but we feel that /etc is a more logical place for +this kind of file. + +Finish installing the package: + +make install + +Vim can run in old-fashioned vi mode by +creating a symlink, which may be created with the following command: + +ln -s vim /usr/bin/vi If you plan to install the X Window system on your LFS system, you might want to re-compile Vim after you have installed X. Vim diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 78965faf5..a0c61878f 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -5,9 +5,9 @@ Estimated build time: &vim-time; Estimated required disk space: &vim-compsize; -&c6-vim-inst; -&c6-vim-exp; -&aa-vim-desc; +&aa-vim-shortdesc; +&aa-vim-alt; &aa-vim-dep; +&c6-vim-inst; diff --git a/entities/gawk.ent b/entities/gawk.ent index 4b01b3cb8..783fa3e74 100644 --- a/entities/gawk.ent +++ b/entities/gawk.ent @@ -6,7 +6,6 @@ - diff --git a/entities/vim.ent b/entities/vim.ent index 50814e8c6..c8e9661ef 100644 --- a/entities/vim.ent +++ b/entities/vim.ent @@ -7,9 +7,11 @@ - + + +