X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=b8705376afdb9a6386739b36b2a35579a4019d26;hb=62b2042961d9102629b06a527a92bc38b0fd17d2;hp=ade4f410e208732b941485ca4e7f195c3873aca6;hpb=f525f992e5dbeb579981153775cc9ee10b78cb3f;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index ade4f410e2..b8705376af 100644
--- a/config.make.in
+++ b/config.make.in
@@ -7,16 +7,18 @@ MISSING_REQUIRED = @REQUIRED@
 
 package-depth = @package_depth@
 
-USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_CFLAGS@ @FREETYPE2_CFLAGS@
-USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_CFLAGS@ @FREETYPE2_CFLAGS@
+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_LIBS@ @FREETYPE2_LIBS@
+EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_FT2_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@
 
 PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
-prefix = $(DESTDIR)@prefix@
+HAVE_LIBKPATHSEA_SO = @HAVE_LIBKPATHSEA_SO@
+
+prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 builddir = @ugh_ugh_autoconf250_builddir@
@@ -40,17 +42,18 @@ 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)
+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)
 
 
-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)
+local_package_datadir = $(lilypond_datadir)
+local_package_libdir = $(lilypond_libdir)
+local_package_docdir = $(lilypond_docdir)
+local_package_omfdir = $(lilypond_omfdir)
 
 vimdir = $(local_package_datadir)/vim
 
@@ -62,47 +65,49 @@ lilypond_omfdir = $(package_omfdir)
 local_lilypond_datadir = $(local_package_datadir)
 local_lilypond_libdir = $(local_package_libdir)
 
+BASH = @BASH@
+BISON = @BISON@
 CC = @CC@
-GCC = @GCC@
+CONFIGSUFFIX = @CONFIGSUFFIX@
 CROSS = @cross_compiling@
 CXX = @CXX@
-GXX = @GXX@
-LD = @LD@
-CONFIGSUFFIX = @CONFIGSUFFIX@
-MAKEINFO_PROGRAM = @MAKEINFO@
-SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
-MAKEINFO_VERSION = @MAKEINFO_VERSION@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-TFM_PATH = @TFM_PATH@
-RANLIB = @RANLIB@
-DEFS = @DEFS@
 DEFINES = @DEFS@ @DEFINES@
+DEFS = @DEFS@
 DOTEXE = @DOTEXE@
-INSTALL = @INSTALL@
-BASH = @BASH@
-BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
+FONTFORGE = @FONTFORGE@
+GCC = @GCC@
 GROFF = @GROFF@
 GUILE = @GUILE@
-GUILE_CONFIG = @GUILE_CONFIG@
 GUILE_CFLAGS = @GUILE_CFLAGS@
+GUILE_CONFIG = @GUILE_CONFIG@
 GUILE_LDFLAGS = @GUILE_LDFLAGS@
+GXX = @GXX@
+ICFLAGS = @ICFLAGS@
+ILDFLAGS = @ILDFLAGS@
 INIMETAFONT = @INIMETAFONT@
+INSTALL = @INSTALL@
+KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LD = @LD@
 LN = @LN@
 LN_S = @LN_S@
-METAFONT = @METAFONT@
+MAKEINFO_PROGRAM = @MAKEINFO@
+MAKEINFO_VERSION = @MAKEINFO_VERSION@
+METAFONT = @METAFONT@ -progname=mf
 MFMODE = @MFMODE@
+MFTRACE = @MFTRACE@
 MSGFMT = @MSGFMT@
-ROOTSEP = @ROOTSEP@
+PAPERSIZE=a4
 PATHSEP = @PATHSEP@
 PERL = @PERL@
-MFTRACE = @MFTRACE@
 PYTHON = @PYTHON@
+RANLIB = @RANLIB@
+ROOTSEP = @ROOTSEP@
 SHELL = @SHELL@
+SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
 TAR = @TAR@
+TFM_PATH = @TFM_PATH@
+TTFTOOL_ENDIAN = @TTFTOOL_ENDIAN@
 YACC = @YACC@
 ZIP = @ZIP@
-
-PAPERSIZE=a4