X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=35f1fad4351b11d24ada10868773396bba618cbb;hb=468b01e50ec2a1b65589a6d51840b0d5915f206b;hp=342408694c4ffa865a47da2221796b49c9e9e87f;hpb=e349fe51126a356f064bb83506cddf90891659a0;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index 342408694c..35f1fad435 100644
--- a/config.make.in
+++ b/config.make.in
@@ -19,15 +19,14 @@ PACKAGE_NAME = @PACKAGE_NAME@
 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@
 infodir = @infodir@
 libdir = @libdir@
-lilypond_datadir = @package_datadir@
-local_lilypond_datadir = @local_package_datadir@
 localedir = @localedir@
 mandir = @mandir@
 program_prefix = @program_prefix@
@@ -35,6 +34,27 @@ 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@