X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=c15f94f87e3866982eac21d1e1776ec9c71f9be4;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=cd21688ad7b0e8e5250c3df315aa74d7193c7c37;hpb=75e2b24fabd5962901580b0d3627cee6b0aa41c1;p=lilypond.git diff --git a/lily/font-config.cc b/lily/font-config.cc index cd21688ad7..c15f94f87e 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -29,18 +29,15 @@ init_fontconfig () font_config_global = FcConfigGetCurrent (); Array 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];