From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 20 Dec 2007 10:41:52 +0000 (+0100)
Subject: Remove trailing slashes from fontconfig dirs.
X-Git-Tag: release/2.11.37-1~25^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7fbfe764accc2d65d0e4df858ea949b2e26d63f0;p=lilypond.git

Remove trailing slashes from fontconfig dirs.

Should fix Lily on Windows with current GUB/fontconfig.
---

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++)
     {