13
0

don't bother trying to set FONTCONFIG_FILE on linux if /etc/fonts stuff doesn't exist - we don't include any data to make this useful

git-svn-id: svn://localhost/ardour2/branches/3.0@14035 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-01-30 12:55:59 +00:00
parent aff8612b58
commit d1c9bc0e72

View File

@ -276,11 +276,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
setenv ("FONTCONFIG_FILE", "/etc/fonts/fonts.conf", 1);
setenv ("FONTCONFIG_PATH", "/etc/fonts", 1);
} else {
/* use the one included in the bundle */
path = Glib::build_filename (dir_path, "etc/fonts/fonts.conf");
setenv ("FONTCONFIG_FILE", path.c_str(), 1);
export_search_path (dir_path, "FONTCONFIG_PATH", "/etc/fonts");
error << _("No fontconfig file found on your system. Things may looked very odd or ugly") << endmsg;
}
/* write a pango.rc file and tell pango to use it. we'd love