* lily/include/context.hh (class Context): make members protected.

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index a48fac837bea08ed34b917e254f1eacd3d0f9466..1724a5fad53a8bbfe9a7422bac295bc04f9c3f32 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -37,7 +37,7 @@ stepmake = @stepmake@
 docdir = $(datadir)/doc/
 omfdir = $(datadir)/omf/
 elispdir = $(datadir)/emacs/site-lisp
-vimdir = $(datadir)/vim
+# forced instead of $(datadir)/vim
 
 # move out of config.make.in?
 package_datadir = $(datadir)/$(package)
@@ -46,11 +46,14 @@ package_libdir = $(libdir)/$(package)
 package_docdir = $(docdir)/$(package)
 package_omfdir = $(omfdir)/$(package)
 
+
 local_package_datadir = $(lilypond_datadir)/$(TOPLEVEL_VERSION)
 local_package_libdir = $(lilypond_libdir)/$(TOPLEVEL_VERSION)
 local_package_docdir = $(lilypond_docdir)/$(TOPLEVEL_VERSION)
 local_package_omfdir = $(lilypond_omfdir)/$(TOPLEVEL_VERSION)
 
+vimdir = $(local_package_datadir)/vim
+
 lilypond_datadir = $(package_datadir)
 lilypond_libdir = $(package_libdir)
 lilypond_docdir = $(package_docdir)