X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=1724a5fad53a8bbfe9a7422bac295bc04f9c3f32;hb=0c2af603fc3b4a9a35baea36ad190d3995af5d1a;hp=57fdbc39da5f3787410e8498a6630bb9a7c98af7;hpb=63c9cee8ce190aaae4a5db3d2e200d35a570838d;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index 57fdbc39da..1724a5fad5 100644
--- a/config.make.in
+++ b/config.make.in
@@ -1,40 +1,108 @@
 # -*-Makefile-*-
 
+MISSING_OPTIONAL = @OPTIONAL@
+MISSING_REQUIRED = @REQUIRED@
+
 # @configure_input@
 
-INSTALL = @INSTALL@
-USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
-USER_LDFLAGS =
+package-depth = @package_depth@
 
-CXX = @CXX@
-POD2HTML= @POD2HTML@
-POD2MAN = @POD2MAN@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-libdir = @libdir@
-prefix = @prefix@
-TEXPREFIX = @TEXPREFIX@
-TEXDIR = @TEXDIR@
-TAR= @TAR@
-MFDIR = @MFDIR@
-mandir  =  @mandir@
+USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
+USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
+USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
+EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@
+
+PACKAGE = @PACKAGE@
+package = @package@
+PACKAGE_NAME = @PACKAGE_NAME@
+
+prefix = $(DESTDIR)@prefix@
 exec_prefix = @exec_prefix@
+
+builddir = @ugh_ugh_autoconf250_builddir@
+build_lilypond_datadir = @build_package_datadir@
+build_lilypond_libdir = @build_package_libdir@
 bindir = @bindir@
-includedir = @includedir@
 datadir = @datadir@
-EXTRA_LIBES = @EXTRA_LIBES@
+includedir = @includedir@
+infodir = @infodir@
+libdir = @libdir@
+localedir = @localedir@
+mandir = @mandir@
+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?
+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)
+lilypond_omfdir = $(package_omfdir)
+
+local_lilypond_datadir = $(local_package_datadir)
+local_lilypond_libdir = $(local_package_libdir)
+
+CC = @CC@
+GCC = @GCC@
+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@
-#SET_MAKE = @SET_MAKE@
 DEFINES = @DEFS@ @DEFINES@
-FIND = @FIND@
-COMPILEINFO = @COMPILEINFO@
+DOTEXE = @DOTEXE@
+INSTALL = @INSTALL@
+BASH = @BASH@
 BISON = @BISON@
+FIND = @FIND@
 FLEX = @FLEX@
+GROFF = @GROFF@
+GUILE = @GUILE@
+GUILE_CONFIG = @GUILE_CONFIG@
+GUILE_CFLAGS = @GUILE_CFLAGS@
+GUILE_LDFLAGS = @GUILE_LDFLAGS@
+INIMETAFONT = @INIMETAFONT@
 LN = @LN@
-ZIP = @ZIP@
+LN_S = @LN_S@
+METAFONT = @METAFONT@
+MFMODE = @MFMODE@
+MSGFMT = @MSGFMT@
+ROOTSEP = @ROOTSEP@
+PATHSEP = @PATHSEP@
 PERL = @PERL@
+MFTRACE = @MFTRACE@
 PYTHON = @PYTHON@
-OUTDIR_NAME = @OUTDIR_NAME@
-
+SHELL = @SHELL@
+TAR = @TAR@
+YACC = @YACC@
+ZIP = @ZIP@
 
+PAPERSIZE=a4