X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=a133e48f4c5c6f2e6a9b849a6075087e27025120;hb=10809c81d2cf7066eb9838e732900229a900824b;hp=3e54d8152d880e31962f841131845764e6cb306b;hpb=e1d47884955f31275ebb0972a08efd1d9d0457dc;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index 3e54d8152d..a133e48f4c 100644
--- a/config.make.in
+++ b/config.make.in
@@ -3,6 +3,7 @@
 MISSING_OPTIONAL = @OPTIONAL@
 MISSING_REQUIRED = @REQUIRED@
 
+
 # @configure_input@
 
 package-depth = @package_depth@
@@ -27,10 +28,6 @@ datadir = @datadir@
 includedir = @includedir@
 infodir = @infodir@
 libdir = @libdir@
-lilypond_datadir = @package_datadir@
-lilypond_libdir = @package_libdir@
-local_lilypond_datadir = @local_package_datadir@
-local_lilypond_libdir = @local_package_libdir@
 localedir = @localedir@
 mandir = @mandir@
 program_prefix = @program_prefix@
@@ -38,6 +35,28 @@ program_suffix = @program_suffix@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 stepmake = @stepmake@
+docdir = $(datadir)/doc/
+omfdir = $(datadir)/omf/
+elispdir = $(datadir)/emacs/site-lisp
+
+# 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@
@@ -46,7 +65,7 @@ CXX = @CXX@
 GXX = @GXX@
 LD = @LD@
 CONFIGSUFFIX = @CONFIGSUFFIX@
-MAKEINFO = @MAKEINFO@
+MAKEINFO_PROGRAM = @MAKEINFO@
 SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
@@ -57,8 +76,6 @@ DEFINES = @DEFS@ @DEFINES@
 DOTEXE = @DOTEXE@
 INSTALL = @INSTALL@
 BASH = @BASH@
-BIBTEX2HTML=@BIBTEX2HTML@
-BIBTEX2HTML_FLAGS=@BIBTEX2HTML_FLAGS@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
@@ -80,6 +97,7 @@ MFTRACE = @MFTRACE@
 PYTHON = @PYTHON@
 SHELL = @SHELL@
 TAR = @TAR@
-TBL = @TBL@
-TROFF = @TROFF@
+YACC = @YACC@
 ZIP = @ZIP@
+
+PAPERSIZE=a4