- String builddir = prefix_directory + "/mf/out/";
- if (stat (builddir.to_str0 (), &statbuf) == 0)
- dirs.push (builddir.to_str0 ());
- else
- {
- dirs.push (prefix_directory + "/fonts/otf/");
- dirs.push (prefix_directory + "/fonts/type1/");
- dirs.push (prefix_directory + "/fonts/cff/");
- dirs.push (prefix_directory + "/fonts/svg/");
- dirs.push (prefix_directory + "/fonts/cff/");
- }
+ String build_prefix = prefix_directory + "share/lilypond/" TOPLEVEL_VERSION;
+ if (stat (build_prefix.to_str0 (), &statbuf) == 0)
+ prefix_directory = build_prefix;
+
+ dirs.push (prefix_directory + "/fonts/otf/");
+ dirs.push (prefix_directory + "/fonts/type1/");
+ dirs.push (prefix_directory + "/fonts/cff/");
+ dirs.push (prefix_directory + "/fonts/svg/");