*** empty log message ***

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index 35653f50deb084d02f1fc49aa769d6500f04d950..971ab5c59d2a5ca62be69ac820d0da7046754942 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -36,36 +36,32 @@ program_suffix = @program_suffix@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 stepmake = @stepmake@
-docdir = $(datadir)/doc/
-omfdir = $(datadir)/omf/
+docdir = $(datadir)/doc
+omfdir = $(datadir)/omf
 elispdir = $(datadir)/emacs/site-lisp
-# forced instead of $(datadir)/vim
 
-# move out of config.make.in?
-
-# FIXME: naming scheme has been broken
-#     package_ is supposed to be '.../lilypond', while
-#     local_ means: .../lilypond-x.y.z or .../lilypond/x.y.z
-
-package_suffix = $(package)/$(TOPLEVEL_VERSION)
-package_datadir = $(datadir)/$(package_suffix)
-package_infodir = $(infodir)/$(package_suffix)
-package_libdir = $(libdir)/$(package_suffix)
-
-# FIXME: docdir using /version/?
-package_docdir = $(docdir)/$(package_suffix)
-package_omfdir = $(omfdir)/$(package_suffix)
+package_datadir = $(datadir)/$(package)
+package_infodir = $(infodir)/$(package)
+package_libdir = $(libdir)/$(package)
+package_docdir = $(docdir)/$(package)
+package_omfdir = $(omfdir)/$(package)
 
 local_package_datadir = $(package_datadir)/$(TOPLEVEL_VERSION)
-local_package_libdir = $(lilypond_libdir)
-local_package_docdir = $(lilypond_docdir)
-local_package_omfdir = $(lilypond_omfdir)
+local_package_docdir = $(package_docdir)/$(TOPLEVEL_VERSION)
+local_package_libdir = $(package_libdir)/$(TOPLEVEL_VERSION)
+local_package_omfdir = $(package_omfdir)/$(TOPLEVEL_VERSION)
+
+local_lilypond_datadir = $(local_package_datadir)
+local_lilypond_docdir = $(local_package_docdir)
+local_lilypond_libdir = $(local_package_libdir)
+local_lilypond_omfdir = $(local_package_omfdir)
 
-lilypond_libdir = $(package_libdir)
+lilypond_datadir = $(local_package_datadir)
+lilypond_libdir = $(local_package_libdir)
 lilypond_docdir = $(package_docdir)
-lilypond_omfdir = $(package_omfdir)
+lilypond_omfdir = $(local_package_omfdir)
 
-lilypond_datadir = $(package_datadir)/$(TOPLEVEL_VERSION)
+webdir = $(lilypond_docdir)/html
 vimdir = $(lilypond_datadir)/vim
 
 BASH = @BASH@