X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=39ae3c2a76c7c64d69d7ceebc7d2e08319ad4416;hb=b4d4ac4ddd6c142a7017918814e3a0a57a037861;hp=742887f6846efdb84ec21a2f3d6aa1abc133350f;hpb=fe3687d66d2a768c83fede50ce901c6ef1b4969e;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++)
     {