* Documentation/user/henle-flat-gray.png (Module): new file.

[lilypond.git] / Documentation / topdocs / INSTALL.texi

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 31ea764b7a10820bf40ab4c448d246f0de8f6b5f..db1a748b5d28073e8b6b496a5fd1a1839b842c6c 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -2,6 +2,9 @@
 @setfilename INSTALL.info
 @settitle INSTALL - compiling and installing GNU LilyPond
 
+@documentencoding utf-8
+@documentlanguage en
+
 @node Top
 @top
 
@@ -79,13 +82,6 @@ work.
 (version 1.6.5 or newer).  If you are installing binary packages, you
 may need to install guile-devel or guile-dev or libguile-dev too.
 
-@item @uref{http://www.gnu.org/software/flex/,Flex} (version 2.5.4a or newer).
-
-WARNING: plain Flex 2.5.4(a) generates invalid C++ code.  GCC 3.x
-chokes on this.  If you wish to use GCC 3.x, make sure that your
-distribution supports g++ 3.x and flex.  For workarounds, see
-lexer-gcc-3.1.sh in the source directory.
-
 @item @TeX{}.
 
 @TeX{} is used as an optional output backend.
@@ -251,13 +247,9 @@ your @var{load-path} by appending the following line (as modified) to your
 @section Vim mode
 
 A Vim mode for entering music and running LilyPond is contained in the
-source archive in @code{$VIM} directory.  For version 6.2 and newer,
-Vim-mode works directly after installing LilyPond.  Otherwise,
-complete the following two steps.
+source archive in @code{$VIM} directory.
 
-For earlier versions (and if @code{$VIM} environment variable does not
-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
+The LilyPond file type is detected if the file @file{~/.vim/filetype.vim} @c
 has the following content
 @quotation
 @example
@@ -269,17 +261,21 @@ augroup filetypedetect
 augroup END
 @end example
 @end quotation
-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
+
+Please include this path by appending the following line to your
 @file{~/.vimrc}
+
 @quotation
 @example
-set runtimepath+=/usr/local/share/vim/
+set runtimepath+=/usr/local/share/lilypond/$@{LILYPOND_VERSION@}/vim/
 @end example
 @end quotation
 
+@noindent
+where $@{LILYPOND_VERISON@} is your lilypond version.  If Lilypond was not
+installed in @file{/usr/local/}, then change this path accordingly.
+
+
 @section Problems
 
 For help and questions use @email{lilypond-user@@gnu.org}.  Send bug
@@ -290,7 +286,7 @@ Bugs that are not fault of LilyPond are documented here.
 @subsection Bison 1.875
 
 There is a bug in bison-1.875: compilation fails with "parse error
-before `goto'" in line 4922 due to a bug in bison. To fix, either
+before `goto'" in line 4922 due to a bug in bison. To fix, please
 recompile bison 1.875 with the following fix
 
 @quotation
@@ -340,6 +336,16 @@ make conf=gcc-3.1
 @end example
 @end quotation
 
+@unnumberedsubsec MacOS X
+
+For Fink, use the following command to compile.
+
+@verbatim
+export GUILE=guile-1.6
+export GUILE_CONFIG=guile-1.6-config
+export PKG_CONFIG_PATH=/sw/lib/freetype219/lib/pkgconfig/:/sw/lib/fontconfig2/lib/pkgconfig/
+./configure --without-kpathsea
+@end verbatim
 
 @unnumberedsubsec OpenBSD