Merge branch 'master' into dev/texi2html

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index 9da7a9d1ef546a8d1fc85dbd3c71766d56c72e5e..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
@@ -89,7 +90,7 @@ webdir = $(lilypond_docdir)/html
 vimdir = $(lilypond_datadir)/vim
 
 
-NCSB_DIR = @NCSB_DIR@
+NCSB_SOURCE_FILES = @NCSB_SOURCE_FILES@
 
 ################################################################
 ## PROGRAMS
@@ -107,6 +108,7 @@ DEFS = @DEFS@
 DOCUMENTATION = @DOCUMENTATION@
 DOTEXE = @DOTEXE@
 FIND = @FIND@
+FCMATCH = @FCMATCH@
 FLEX = @FLEX@
 FLEXLEXER_FILE = @FLEXLEXER_FILE@
 FONTFORGE = @FONTFORGE@
@@ -124,16 +126,16 @@ 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@
 PERL = @PERL@
 PLATFORM_WINDOWS = @PLATFORM_WINDOWS@
 PYTHON = @PYTHON@
+TARGET_PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 ROOTSEP = @ROOTSEP@
 SHELL = @SHELL@
@@ -142,6 +144,3 @@ TAR = @TAR@
 WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
-
-
-