From: hanwen <hanwen>
Date: Thu, 20 Oct 2005 23:08:14 +0000 (+0000)
Subject: (init_fontconfig): resurrect mf/out/ check.
X-Git-Tag: release/2.7.16^2~56
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c7f4b1a2bd55bd7c9fd3e3c23dde7b2e02fdc4fb;p=lilypond.git

(init_fontconfig): resurrect mf/out/ check.
---

diff --git a/ChangeLog b/ChangeLog
index 23ba0eb537..c4ddafd0f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/font-config.cc (init_fontconfig): resurrect mf/out/ check.
+	
 2005-10-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* stepmake/stepmake/script-vars.make (PYTHON_SCRIPTS_IN): Oops.  Add.
diff --git a/lily/font-config.cc b/lily/font-config.cc
index c15f94f87e..c48f1abc5a 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -29,15 +29,20 @@ init_fontconfig ()
 
   font_config_global = FcConfigGetCurrent ();
   Array<String> dirs;
+  String builddir = prefix_directory + "/mf/out/";
 
-  /*
-    ugh. C&P main.cc
-  */
-  dirs.push (prefix_directory + "/fonts/otf/");
-  dirs.push (prefix_directory + "/fonts/type1/");
-  dirs.push (prefix_directory + "/fonts/cff/");
-  dirs.push (prefix_directory + "/fonts/svg/");
-  
+  if (stat (builddir.to_str0 (), &statbuf) == 0)
+    dirs.push (builddir.to_str0 ());
+  else
+    {
+      /*
+	ugh. C&P main.cc
+      */
+      dirs.push (prefix_directory + "/fonts/otf/");
+      dirs.push (prefix_directory + "/fonts/type1/");
+      dirs.push (prefix_directory + "/fonts/cff/");
+      dirs.push (prefix_directory + "/fonts/svg/");
+    }  
   for (int i = 0; i < dirs.size (); i++)
     {
       String dir = dirs[i];