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@
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_infodir = $(infodir)/$(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@
GXX = @GXX@
LD = @LD@
CONFIGSUFFIX = @CONFIGSUFFIX@
-MAKEINFO = @MAKEINFO@
+MAKEINFO_PROGRAM = @MAKEINFO@
SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
+MAKEINFO_VERSION = @MAKEINFO_VERSION@
ICFLAGS = @ICFLAGS@
ILDFLAGS = @ILDFLAGS@
TFM_PATH = @TFM_PATH@
DOTEXE = @DOTEXE@
INSTALL = @INSTALL@
BASH = @BASH@
-BIBTEX2HTML=@BIBTEX2HTML@
-BIBTEX2HTML_FLAGS=@BIBTEX2HTML_FLAGS@
BISON = @BISON@
FIND = @FIND@
FLEX = @FLEX@
PYTHON = @PYTHON@
SHELL = @SHELL@
TAR = @TAR@
-TBL = @TBL@
-TROFF = @TROFF@
+YACC = @YACC@
ZIP = @ZIP@
+
+PAPERSIZE=a4