(write_fontlist): use new markup syntax

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index b1cb9d284136d8040f7c05b6f5503947bd5cf207..1bfe4ca5d94aa842fb1eba26db42a5e9eeaaa735 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -12,14 +12,16 @@ USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
 USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
 EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@
 
-PACKAGE = LILYPOND # @PACKAGE@
-package = lilypond # @package@
-PACKAGE_NAME =  LilyPond #@PACKAGE_NAME@
+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@
@@ -33,6 +35,17 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 stepmake = @stepmake@
 
+# move out of config.make.in?
+package_datadir = $(datadir)/$(package)
+package_libdir = $(libdir)/$(package)
+local_package_datadir = $(lilypond_datadir)/$(TOPLEVEL_VERSION)
+local_package_libdir = $(lilypond_libdir)/$(TOPLEVEL_VERSION)
+
+lilypond_datadir = $(package_datadir)
+lilypond_libdir = $(package_libdir)
+local_lilypond_datadir = $(local_package_datadir)
+local_lilypond_libdir = $(local_package_libdir)
+
 CC = @CC@
 GCC = @GCC@
 CROSS = @cross_compiling@
@@ -70,7 +83,7 @@ MSGFMT = @MSGFMT@
 ROOTSEP = @ROOTSEP@
 PATHSEP = @PATHSEP@
 PERL = @PERL@
-PKTRACE = @PKTRACE@
+MFTRACE = @MFTRACE@
 PYTHON = @PYTHON@
 SHELL = @SHELL@
 TAR = @TAR@