X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=4464eb224f185bb8b02f0bb564e80f1fb0a96d43;hb=b2bba8f2ecf6bd5e8b755c45b8f271d09ddaa79f;hp=048aebd4e3c6b8c33d7c610b4c81a2ec2fd23efc;hpb=0c8332d2eeceea4ffd5c8a40cc8884502ec4f641;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index 048aebd4e3..4464eb224f 100644
--- a/config.make.in
+++ b/config.make.in
@@ -3,15 +3,14 @@
 MISSING_OPTIONAL = @OPTIONAL@
 MISSING_REQUIRED = @REQUIRED@
 
-
 # @configure_input@
 
 package-depth = @package_depth@
 
-USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
-USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
+USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
+USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
 USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
-EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@
+EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_FT2_LIBS@ @FREETYPE2_LIBS@
 
 PACKAGE = @PACKAGE@
 package = @package@
@@ -37,18 +36,24 @@ srcdir = @srcdir@
 stepmake = @stepmake@
 docdir = $(datadir)/doc/
 omfdir = $(datadir)/omf/
+elispdir = $(datadir)/emacs/site-lisp
+# forced instead of $(datadir)/vim
 
 # move out of config.make.in?
 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)/$(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)
@@ -66,6 +71,7 @@ LD = @LD@
 CONFIGSUFFIX = @CONFIGSUFFIX@
 MAKEINFO_PROGRAM = @MAKEINFO@
 SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
+MAKEINFO_VERSION = @MAKEINFO_VERSION@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 TFM_PATH = @TFM_PATH@
@@ -78,6 +84,7 @@ BASH = @BASH@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
+FONTFORGE = @FONTFORGE@
 GROFF = @GROFF@
 GUILE = @GUILE@
 GUILE_CONFIG = @GUILE_CONFIG@