X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=55ff72debc02ca391d033f8cd6a31043ea07e436;hb=d4eeffef422b68e35e232a8688693d06db7c0e49;hp=ef14aaee801fff67798b7f667056c64b4a69143a;hpb=145376509af3f2caf35122d257d24eb7edcb7092;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index ef14aaee80..55ff72debc 100644
--- a/config.make.in
+++ b/config.make.in
@@ -3,20 +3,14 @@
 MISSING_OPTIONAL = @OPTIONAL@
 MISSING_REQUIRED = @REQUIRED@
 
-PACKAGE_NAME = @PACKAGE_NAME@
-MAJOR_VERSION = @MAJOR_VERSION@
-MINOR_VERSION = @MINOR_VERSION@
-PATCH_LEVEL = @PATCH_LEVEL@
-MY_PATCH_LEVEL = @MY_PATCH_LEVEL@
-
 # @configure_input@
 
 package-depth = @package_depth@
 
-USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
-USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
+USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_CFLAGS@
+USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_CFLAGS@
 USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
-EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@
+EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_LIBS@
 
 PACKAGE = @PACKAGE@
 package = @package@
@@ -42,18 +36,24 @@ srcdir = @srcdir@
 stepmake = @stepmake@
 docdir = $(datadir)/doc/
 omfdir = $(datadir)/omf/
+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)
 
+
 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)
 
+vimdir = $(local_package_datadir)/vim
+
 lilypond_datadir = $(package_datadir)
 lilypond_libdir = $(package_libdir)
 lilypond_docdir = $(package_docdir)
@@ -71,6 +71,7 @@ LD = @LD@
 CONFIGSUFFIX = @CONFIGSUFFIX@
 MAKEINFO_PROGRAM = @MAKEINFO@
 SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
+MAKEINFO_VERSION = @MAKEINFO_VERSION@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 TFM_PATH = @TFM_PATH@