X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=55ff72debc02ca391d033f8cd6a31043ea07e436;hb=16e71c11296fe1291636907b77c32be93d3b4e7c;hp=a48fac837bea08ed34b917e254f1eacd3d0f9466;hpb=cb85d1c77149d3f3cc12dcd3829f85195efe14b7;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index a48fac837b..55ff72debc 100644
--- a/config.make.in
+++ b/config.make.in
@@ -7,10 +7,10 @@ MISSING_REQUIRED = @REQUIRED@
 
 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@
@@ -37,7 +37,7 @@ stepmake = @stepmake@
 docdir = $(datadir)/doc/
 omfdir = $(datadir)/omf/
 elispdir = $(datadir)/emacs/site-lisp
-vimdir = $(datadir)/vim
+# forced instead of $(datadir)/vim
 
 # move out of config.make.in?
 package_datadir = $(datadir)/$(package)
@@ -46,11 +46,14 @@ 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)