From 87970c8f5196465a1b501a2912dcb4ea2f558f54 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 20 Oct 2005 23:08:14 +0000 Subject: [PATCH] (init_fontconfig): resurrect mf/out/ check. --- ChangeLog | 4 ++++ lily/font-config.cc | 21 +++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23ba0eb537..c4ddafd0f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-10-21 Han-Wen Nienhuys + + * lily/font-config.cc (init_fontconfig): resurrect mf/out/ check. + 2005-10-20 Jan Nieuwenhuizen * 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 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]; -- 2.39.2