* stepmake/stepmake/*:

[lilypond.git] / lily / font-config.cc

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 46a38b9048649d7633df349a28b195d459612fb2..c15f94f87e3866982eac21d1e1776ec9c71f9be4 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -27,21 +27,17 @@ init_fontconfig ()
   if (!FcInit ())
     error (_ ("initializing FontConfig failed"));
 
-
   font_config_global = FcConfigGetCurrent ();
   Array<String> dirs;
-  struct stat statbuf;
-  String builddir = prefix_directory + "/mf/out/";
-
-  if (stat (builddir.to_str0 (), &statbuf) == 0)
-    dirs.push (builddir.to_str0 ());
-  else
-    {
-      dirs.push (prefix_directory + "/fonts/otf/");
-      dirs.push (prefix_directory + "/fonts/type1/");
-      dirs.push (prefix_directory + "/fonts/svg/");
-    }
 
+  /*
+    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];