X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=fdfadb5a3497354ff34ee7fe74ce8e337560c036;hb=628ed6264818560d00ac34a438ad31d81f4d4460;hp=0529c4848f1955366efe2306a6bec93852340366;hpb=b7e3626cf632670001a2e74af5083abafd32be55;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index 0529c4848f..fdfadb5a34 100644
--- a/config.make.in
+++ b/config.make.in
@@ -1,77 +1,101 @@
 # -*-Makefile-*-
 
+MISSING_OPTIONAL = @OPTIONAL@
+MISSING_REQUIRED = @REQUIRED@
+
 # @configure_input@
 
 package-depth = @package_depth@
 
-USER_CFLAGS = @CFLAGS@
+USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
 USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
 USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
+EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@
 
-CC = @CC@
-CROSS = @cross_compiling@
-CXX = @CXX@
-GCC = @GCC@
-LD = @LD@
 PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
-stepmake = @stepmake@
-CONFIGSUFFIX = @CONFIGSUFFIX@
-MAKEINFO = @MAKEINFO@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-builddir = @builddir@
-libdir = @libdir@
-prefix = @prefix@
-srcdir = @srcdir@
-TEXPREFIX = @TEXPREFIX@
-TEXDIR = @TEXDIR@
-KPATHSEA = @KPATHSEA@
-MFDIR = @MFDIR@
-mandir = @mandir@
-infodir = @infodir@
+
+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@
+includedir = @includedir@
+infodir = @infodir@
+libdir = @libdir@
 localedir = @localedir@
-sharedstatedir = @sharedstatedir@
+mandir = @mandir@
 program_prefix = @program_prefix@
 program_suffix = @program_suffix@
-EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+stepmake = @stepmake@
+docdir = $(datadir)/doc/
+omfdir = $(datadir)/omf/
+
+# move out of config.make.in?
+package_datadir = $(datadir)/$(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_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@
+ICFLAGS = @ICFLAGS@
+ILDFLAGS = @ILDFLAGS@
 TFM_PATH = @TFM_PATH@
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 DEFINES = @DEFS@ @DEFINES@
-COMPILEINFO = @COMPILEINFO@
 DOTEXE = @DOTEXE@
 INSTALL = @INSTALL@
 BASH = @BASH@
-BIBTEX2HTML=@BIBTEX2HTML@
-BIBTEX2HTML_FLAGS=@BIBTEX2HTML_FLAGS@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
+GROFF = @GROFF@
 GUILE = @GUILE@
+GUILE_CONFIG = @GUILE_CONFIG@
+GUILE_CFLAGS = @GUILE_CFLAGS@
+GUILE_LDFLAGS = @GUILE_LDFLAGS@
 INIMETAFONT = @INIMETAFONT@
-INIMETAPOST = @INIMETAPOST@
-INIMETAPOST_FLAGS = @INIMETAPOST_FLAGS@
 LN = @LN@
 LN_S = @LN_S@
 METAFONT = @METAFONT@
 MFMODE = @MFMODE@
-METAPOST = @METAPOST@
-MFPLAIN_MP = @MFPLAIN_MP@
 MSGFMT = @MSGFMT@
 ROOTSEP = @ROOTSEP@
 PATHSEP = @PATHSEP@
 PERL = @PERL@
+MFTRACE = @MFTRACE@
 PYTHON = @PYTHON@
 SHELL = @SHELL@
-STRIPROFF = @STRIPROFF@
-TAR= @TAR@
-TBL = @TBL@
-TROFF = @TROFF@
+TAR = @TAR@
+YACC = @YACC@
 ZIP = @ZIP@
 
+PAPERSIZE=a4