Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/font-config.cc b/lily/font-config.cc
index ab530eabfdea9221866841d9c0902176055ecc8a..5c1bad2d34608d2b680861d066f248d49248bd79 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -45,8 +45,10 @@ init_fontconfig ()
                        
   vector<string> dirs;
 
-  dirs.push_back (prefix_directory + "/fonts/otf/");
-  dirs.push_back (prefix_directory + "/fonts/type1/");
+  /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0)
+     on windows.  */
+  dirs.push_back (lilypond_datadir + "/fonts/otf");
+  dirs.push_back (lilypond_datadir + "/fonts/type1");
   
   for (vsize i = 0; i < dirs.size (); i++)
     {
@@ -58,11 +60,11 @@ init_fontconfig ()
     }
   
   if (be_verbose_global)
-    progress_indication ("Building font database.\n");
+    message (_ ("Building font database."));
   FcConfigBuildFonts (font_config_global);
   FcConfigSetCurrent (font_config_global);
   if (be_verbose_global)
-    progress_indication ("\n");
+    message ("\n");
 
   if (cache_file
       && !is_file ((char*)cache_file))