From fbb222aa2b18e0153b6275a3c1cffaf6b05b67df Mon Sep 17 00:00:00 2001
From: Heikki Junes <heikki.junes@hut.fi>
Date: Tue, 23 Mar 2004 10:11:19 +0000
Subject: [PATCH]         * Documentation/topdocs/INSTALL.texi: give even more
 detailed orders.

        * vim/vimrc: add a one-liner file.

        * vim/GNUmake try to remove empty dirs during uninstalling, put
        vimrc in EXTRA_DIST_FILES.
---
 ChangeLog                          |  7 +++++++
 Documentation/topdocs/INSTALL.texi | 18 ++++++++++--------
 vim/GNUmakefile                    | 11 ++++++++++-
 vim/vimrc                          |  1 +
 4 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 vim/vimrc

diff --git a/ChangeLog b/ChangeLog
index e7701642cd..c606093600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,13 @@
 
 	* vim/GNUmakefile: add local-uninstall target.
 
+	* Documentation/topdocs/INSTALL.texi: give even more detailed orders.
+	
+	* vim/vimrc: add a one-liner file.
+
+	* vim/GNUmakefile: try to remove empty dirs during uninstalling, put
+	vimrc in EXTRA_DIST_FILES.
+
 2004-03-22  Heikki Junes  <hjunes@cc.hut.fi>
 
         * config.make.in: add vimdir.
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index e778194f8c..7c34d3c6a3 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -240,11 +240,12 @@ to your @var{load-path}. Append the following line (modified) to your
 
 A Vim mode for entering music and running LilyPond is contained in the 
 source archive. For version 6.2 and newer, Vim-mode works directly after 
-installing LilyPond. 
+installing LilyPond. Otherwise, complete the following two steps.
 
 For earlier versions (and if @code{$VIM} environment variable does not
-fall-back to @file{/usr/share/vim}), the LilyPond file type is detected 
-if your file @file{~/.vim/filetype.vim} has the following content:
+fall-back to @file{/usr/local/share/vim}, see @code{:version} in vim), 
+the LilyPond file type is detected if your file @file{~/.vim/filetype.vim} @c
+has the following content:
 @example
 	if exists("did_load_filetypes")
   	  finish
@@ -253,12 +254,13 @@ if your file @file{~/.vim/filetype.vim} has the following content:
   	  au! BufNewFile,BufRead *.ly           setf lilypond
 	augroup END
 @end example
-If Vim has been installed to @file{/usr/local/...} instead of 
-@file{/usr/...}, then @file{/usr/share/vim} may not be specified in 
-your @code{$VIMRUNTIME} environment variable and you have to include this 
-path explicitly by appending the following line to your @file{~/.vimrc}:
+If Vim has been (pre-)installed to @file{/usr/...} (or any other place) 
+instead of @file{/usr/local/...}, then @file{/usr/local/share/vim} may not 
+be specified in your @code{$VIMRUNTIME} environment variable and you have to 
+include this path explicitly by appending the following line to your 
+@file{~/.vimrc}:
 @example
-	set runtimepath+=/usr/share/vim/
+	set runtimepath+=/usr/local/share/vim/
 @end example
 
 @section Problems
diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index 230194fb61..ae98124e8d 100644
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -27,12 +27,21 @@ local-install:
 
 local-uninstall:
 	rm $(vimdir)/compiler/lilypond.vim
+	rmdir -p $(vimdir)/compiler 
+
 	rm $(vimdir)/ftdetect/lilypond.vim
+	rmdir -p $(vimdir)/ftdetect 
+
 	rm $(vimdir)/ftplugin/lilypond.vim
+	rmdir -p $(vimdir)/ftplugin 
+
 	rm $(vimdir)/indent/lilypond.vim
+	rmdir -p $(vimdir)/indent 
+
 	rm $(vimdir)/syntax/lilypond.vim
+	rmdir -p $(vimdir)/syntax
 
-EXTRA_DIST_FILES=filetype.vim
+EXTRA_DIST_FILES=filetype.vim vimrc
 
 LILYPOND_WORDS = $(outdir)/lilypond-words $(outdir)/lilypond-words.vim
 LILYPOND_WORDS_DEPENDS =\
diff --git a/vim/vimrc b/vim/vimrc
new file mode 100644
index 0000000000..98a3064bb0
--- /dev/null
+++ b/vim/vimrc
@@ -0,0 +1 @@
+set runtimepath+=/usr/local/share/vim/
-- 
2.39.2