Merge commit 'origin/master' into dev/texi2html

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index 55dfaefda36c5d75b8cac538be60cdfb1f6aaedc..da0123311f405c6f5d2a378eadd52a50398de12f 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -50,6 +50,7 @@ configure-srcdir = @srcdir@
 bindir = @bindir@
 build_lilypond_datadir = @build_package_datadir@
 build_lilypond_libdir = @build_package_libdir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 docdir = $(datadir)/doc
 elispdir = $(datadir)/emacs/site-lisp
@@ -125,10 +126,9 @@ LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@
 LN = @LN@
 LN_S = @LN_S@
 MAKEINFO_PROGRAM = @MAKEINFO@
-MAKEINFO_VERSION = @MAKEINFO_VERSION@
+TEXI2HTML_PROGRAM = @TEXI2HTML@
 METAFONT = @METAFONT@ -progname=mf
 MFMODE = @MFMODE@
-MFTRACE = @MFTRACE@
 MSGFMT = @MSGFMT@
 PAPERSIZE=a4
 PATHSEP = @PATHSEP@
@@ -144,6 +144,3 @@ TAR = @TAR@
 WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
-
-
-