*** empty log message ***

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index 357f05d0764b568435c01ff9096f59b57ccb5c37..971ab5c59d2a5ca62be69ac820d0da7046754942 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -10,12 +10,14 @@ package-depth = @package_depth@
 USER_CFLAGS = @CPPFLAGS@ @CFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
 USER_CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
 USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
-EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_FT2_LIBS@ @FREETYPE2_LIBS@
+EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_FT2_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@
 
 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@