(write_fontlist): use new markup syntax

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index 33fe5a8ae8072e73287f2ccacd2598a05f511934..1bfe4ca5d94aa842fb1eba26db42a5e9eeaaa735 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -27,9 +27,6 @@ datadir = @datadir@
 includedir = @includedir@
 infodir = @infodir@
 libdir = @libdir@
-lilypond_datadir = @package_datadir@
-local_lilypond_datadir = @local_package_datadir@
-local_lilypond_libdir = @local_package_libdir@
 localedir = @localedir@
 mandir = @mandir@
 program_prefix = @program_prefix@
@@ -38,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@