(init_fontconfig): resurrect mf/out/ check.

diff --git a/ChangeLog b/ChangeLog
index 23ba0eb53747ce5dcc8e0b7b4f7a03349280dffc..c4ddafd0f3aef0355a42eeb34363ed9b1c8615e0 100644 (file)
--- 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 c15f94f87e3866982eac21d1e1776ec9c71f9be4..c48f1abc5ac355cc011089de4a93ece5607321f4 100644 (file)
--- 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];