X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=a5631d21f40469bd63a1e849163b2534878b2a20;hb=998c822a2adead0ad7c0886c5e8d647e646a1926;hp=c6604aa68cd61c2316f5965451c728e39acaf6aa;hpb=ea731dfadf8aedaf6b0a5549a45e8946dc2dae9a;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index c6604aa68c..a5631d21f4 100644
--- a/config.make.in
+++ b/config.make.in
@@ -16,6 +16,8 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
+HAVE_LIBKPATHSEA_SO = @HAVE_LIBKPATHSEA_SO@
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -34,34 +36,33 @@ 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?
-package_suffix = $(package)/$(TOPLEVEL_VERSION)
-package_datadir = $(datadir)/$(package_suffix)
-package_infodir = $(infodir)/$(package_suffix)
-package_libdir = $(libdir)/$(package_suffix)
-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 = $(lilypond_datadir)
-local_package_libdir = $(lilypond_libdir)
-local_package_docdir = $(lilypond_docdir)
-local_package_omfdir = $(lilypond_omfdir)
+local_package_datadir = $(package_datadir)/$(TOPLEVEL_VERSION)
+local_package_docdir = $(package_docdir)/$(TOPLEVEL_VERSION)
+local_package_libdir = $(package_libdir)/$(TOPLEVEL_VERSION)
+local_package_omfdir = $(package_omfdir)/$(TOPLEVEL_VERSION)
 
-vimdir = $(local_package_datadir)/vim
+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_datadir = $(package_datadir)
-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)
 
-local_lilypond_datadir = $(local_package_datadir)
-local_lilypond_libdir = $(local_package_libdir)
+webdir = $(lilypond_docdir)/html
+vimdir = $(lilypond_datadir)/vim
 
 BASH = @BASH@
 BISON = @BISON@
@@ -99,13 +100,15 @@ MSGFMT = @MSGFMT@
 PAPERSIZE=a4
 PATHSEP = @PATHSEP@
 PERL = @PERL@
+PLATFORM_WINDOWS = @PLATFORM_WINDOWS@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 ROOTSEP = @ROOTSEP@
 SHELL = @SHELL@
 SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
 TAR = @TAR@
-TFM_PATH = @TFM_PATH@
 TTFTOOL_ENDIAN = @TTFTOOL_ENDIAN@
+WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
+FLEXLEXER_PATH = @FLEXLEXER_PATH@