(drumNotes): 1.7 fixes

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index 4ae9b932851cddd9ad4b74557dedc14ddefdc67c..35f1fad4351b11d24ada10868773396bba618cbb 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -16,10 +16,12 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
 exec_prefix = @exec_prefix@
 
-builddir = @builddir@
+builddir = @ugh_ugh_autoconf250_builddir@
+build_lilypond_datadir = @build_package_datadir@
+build_lilypond_libdir = @build_package_libdir@
 bindir = @bindir@
 datadir = @datadir@
 includedir = @includedir@
@@ -32,10 +34,33 @@ program_suffix = @program_suffix@
 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 = @MAKEINFO@
@@ -54,6 +79,7 @@ BIBTEX2HTML_FLAGS=@BIBTEX2HTML_FLAGS@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
+GROFF = @GROFF@
 GUILE = @GUILE@
 GUILE_CONFIG = @GUILE_CONFIG@
 GUILE_CFLAGS = @GUILE_CFLAGS@
@@ -67,10 +93,10 @@ MSGFMT = @MSGFMT@
 ROOTSEP = @ROOTSEP@
 PATHSEP = @PATHSEP@
 PERL = @PERL@
-PKTRACE = @PKTRACE@
+MFTRACE = @MFTRACE@
 PYTHON = @PYTHON@
 SHELL = @SHELL@
-TAR= @TAR@
+TAR = @TAR@
 TBL = @TBL@
 TROFF = @TROFF@
 ZIP = @ZIP@