X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=3bf17671a029f0b3123277d98e0afb322fe415d9;hb=HEAD;hp=35653f50deb084d02f1fc49aa769d6500f04d950;hpb=aa95034142df28e67d4b9b90bac9f308cdb99d31;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index 35653f50de..3bf17671a0 100644
--- a/config.make.in
+++ b/config.make.in
@@ -7,110 +7,144 @@ MISSING_REQUIRED = @REQUIRED@
 
 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@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@
+################################################################
+## FLAGS
+################################################################
+
+FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
+GUILE_CFLAGS = @GUILE_CFLAGS@
+PANGO_FT2_CFLAGS = @PANGO_FT2_CFLAGS@
+PYTHON_CFLAGS = @PYTHON_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@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
+PYTHON_LIBS = @PYTHON_LDFLAGS@
+CXXABI_LIBS = @CXXABI_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@
 
-HAVE_LIBKPATHSEA_SO = @HAVE_LIBKPATHSEA_SO@
+HOST_ARCH=@HOST_ARCH@
+
+USE_EXTRACTPDFMARK=@USE_EXTRACTPDFMARK@
+
+################################################################
+## FILESYSTEM
+################################################################
 
 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@
+datarootdir = @datarootdir@
 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
-# forced instead of $(datadir)/vim
-
-# move out of config.make.in?
-
-# FIXME: naming scheme has been broken
-#     package_ is supposed to be '.../lilypond', while
-#     local_ means: .../lilypond-x.y.z or .../lilypond/x.y.z
 
-package_suffix = $(package)/$(TOPLEVEL_VERSION)
-package_datadir = $(datadir)/$(package_suffix)
-package_infodir = $(infodir)/$(package_suffix)
-package_libdir = $(libdir)/$(package_suffix)
-
-# FIXME: docdir using /version/?
-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 = $(package_datadir)/$(TOPLEVEL_VERSION)
-local_package_libdir = $(lilypond_libdir)
-local_package_docdir = $(lilypond_docdir)
-local_package_omfdir = $(lilypond_omfdir)
+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_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)
 
-lilypond_datadir = $(package_datadir)/$(TOPLEVEL_VERSION)
+webdir = $(lilypond_docdir)/html
 vimdir = $(lilypond_datadir)/vim
 
+TEXGYRE_DIR = @TEXGYRE_DIR@
+TEXGYRE_FILES = @TEXGYRE_FILES@
+URWOTF_DIR = @URWOTF_DIR@
+URWOTF_FILES = @URWOTF_FILES@
+
+################################################################
+## PROGRAMS
+################################################################
+
+AR = @AR@
 BASH = @BASH@
 BISON = @BISON@
 CC = @CC@
 CONFIGSUFFIX = @CONFIGSUFFIX@
 CROSS = @cross_compiling@
 CXX = @CXX@
+DBLATEX = @DBLATEX@
 DEFINES = @DEFS@ @DEFINES@
 DEFS = @DEFS@
-DOTEXE = @DOTEXE@
+DOCUMENTATION = @DOCUMENTATION@
+EXTRACTPDFMARK = @EXTRACTPDFMARK@
 FIND = @FIND@
+FCLIST = @FCLIST@
 FLEX = @FLEX@
+FLEXLEXER_FILE = @FLEXLEXER_FILE@
 FONTFORGE = @FONTFORGE@
-GCC = @GCC@
 GROFF = @GROFF@
+GS920 = @GS920@
 GUILE = @GUILE@
 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@
 MAKEINFO_PROGRAM = @MAKEINFO@
-MAKEINFO_VERSION = @MAKEINFO_VERSION@
+TEXI2HTML_PROGRAM = @TEXI2HTML@
 METAFONT = @METAFONT@ -progname=mf
 MFMODE = @MFMODE@
-MFTRACE = @MFTRACE@
 MSGFMT = @MSGFMT@
 PAPERSIZE=a4
 PATHSEP = @PATHSEP@
+PDFTEX = @PDFTEX@
+PDFLATEX = @PDFLATEX@
 PERL = @PERL@
-PYTHON = @PYTHON@
+PLATFORM_WINDOWS = @PLATFORM_WINDOWS@
+PYTHON = @PYTHON@ -tt
+TARGET_PYTHON = @PYTHON@ -tt
 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@