X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;fp=lily%2Ffont-config.cc;h=39ae3c2a76c7c64d69d7ceebc7d2e08319ad4416;hb=7fbfe764accc2d65d0e4df858ea949b2e26d63f0;hp=742887f6846efdb84ec21a2f3d6aa1abc133350f;hpb=8056f0a65473517957274d8b490a3e86f9cc13e3;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 742887f684..39ae3c2a76 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -45,8 +45,10 @@ init_fontconfig ()
 			
   vector<string> dirs;
 
-  dirs.push_back (lilypond_datadir + "/fonts/otf/");
-  dirs.push_back (lilypond_datadir + "/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++)
     {