* stepmake/aclocal.m4 (STEPMAKE_KPATHSEA): Do not include

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index 4464eb224f185bb8b02f0bb564e80f1fb0a96d43..553f291aa93b2e39259b3181de332340f93eb1ff 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -7,8 +7,11 @@ MISSING_REQUIRED = @REQUIRED@
 
 package-depth = @package_depth@
 
-USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
-USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
+#Alternative for dlopen
+#KPATHSEA_LIBS = @KPATHSEA_LIBS@
+
+USER_CFLAGS = @CPPFLAGS@ @CFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
+USER_CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
 USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
 EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_FT2_LIBS@ @FREETYPE2_LIBS@
 
@@ -16,7 +19,7 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
-prefix = $(DESTDIR)@prefix@
+prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 builddir = @ugh_ugh_autoconf250_builddir@
@@ -40,17 +43,18 @@ elispdir = $(datadir)/emacs/site-lisp
 # forced instead of $(datadir)/vim
 
 # 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)
+package_suffix = $(package)$(MAJOR_VERSION).$(MINOR_VERSION)
+package_datadir = $(datadir)/$(package_suffix)
+package_infodir = $(infodir)/$(package_suffix)
+package_libdir = $(libdir)/$(package_suffix)
+package_docdir = $(docdir)/$(package_suffix)
+package_omfdir = $(omfdir)/$(package_suffix)
 
 
-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)
+local_package_datadir = $(lilypond_datadir)
+local_package_libdir = $(lilypond_libdir)
+local_package_docdir = $(lilypond_docdir)
+local_package_omfdir = $(lilypond_omfdir)
 
 vimdir = $(local_package_datadir)/vim
 
@@ -93,7 +97,7 @@ GUILE_LDFLAGS = @GUILE_LDFLAGS@
 INIMETAFONT = @INIMETAFONT@
 LN = @LN@
 LN_S = @LN_S@
-METAFONT = @METAFONT@
+METAFONT = @METAFONT@ -progname=mf
 MFMODE = @MFMODE@
 MSGFMT = @MSGFMT@
 ROOTSEP = @ROOTSEP@