X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=fa49dacdffc1c00837247fc8f59a09167919e308;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=a133e48f4c5c6f2e6a9b849a6075087e27025120;hpb=c6544399495457808105187091178c023508a00f;p=lilypond.git diff --git a/config.make.in b/config.make.in index a133e48f4c..fa49dacdff 100644 --- a/config.make.in +++ b/config.make.in @@ -3,101 +3,128 @@ 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_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@ -EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ +FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GUILE_CFLAGS = @GUILE_CFLAGS@ +PANGO_FT2_CFLAGS = @PANGO_FT2_CFLAGS@ + +CONFIG_CPPFLAGS = @CPPFLAGS@ +CONFIG_DEFINES = @DEFINES@ + +CONFIG_CFLAGS = @CFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS) $(PANGO_FT2_CFLAGS) +CONFIG_CXXFLAGS = @CXXFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS) $(PANGO_FT2_CFLAGS) + +FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +GUILE_LIBS = @GUILE_LDFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +FREETYPE2_LIBS = @FREETYPE2_LIBS@ +PANGO_FT2_LIBS = @PANGO_FT2_LIBS@ + +CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GUILE_LIBS) $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) +CONFIG_LDFLAGS = @LDFLAGS@ 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@ +##configure-builddir = @ugh_ugh_autoconf250_builddir@ +configure-srcdir = @srcdir@ + +bindir = @bindir@ build_lilypond_datadir = @build_package_datadir@ build_lilypond_libdir = @build_package_libdir@ -bindir = @bindir@ datadir = @datadir@ +docdir = $(datadir)/doc +elispdir = $(datadir)/emacs/site-lisp includedir = @includedir@ infodir = @infodir@ libdir = @libdir@ localedir = @localedir@ mandir = @mandir@ +omfdir = $(datadir)/omf program_prefix = @program_prefix@ program_suffix = @program_suffix@ sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ stepmake = @stepmake@ -docdir = $(datadir)/doc/ -omfdir = $(datadir)/omf/ -elispdir = $(datadir)/emacs/site-lisp -# 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) - -lilypond_datadir = $(package_datadir) -lilypond_libdir = $(package_libdir) -lilypond_docdir = $(package_docdir) -lilypond_omfdir = $(package_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) 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 = $(local_package_datadir) +lilypond_libdir = $(local_package_libdir) +lilypond_docdir = $(package_docdir) +lilypond_omfdir = $(local_package_omfdir) + +webdir = $(lilypond_docdir)/html +vimdir = $(lilypond_datadir)/vim +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@ -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@ +FLEXLEXER_PATH = @FLEXLEXER_PATH@ +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@ +LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@ 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@ +PLATFORM_WINDOWS = @PLATFORM_WINDOWS@ PYTHON = @PYTHON@ +RANLIB = @RANLIB@ +ROOTSEP = @ROOTSEP@ SHELL = @SHELL@ +SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@ TAR = @TAR@ +WINDRES = @WINDRES@ YACC = @YACC@ ZIP = @ZIP@ - -PAPERSIZE=a4