summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2009-04-22 13:23:17 +0000
committerDRC <dcommander@users.sourceforge.net>2009-04-22 13:23:17 +0000
commit989dbd1ee9289bc486018fc53b576ed9dfe29d8c (patch)
tree28ceca17e40ae15638541b9dd05f64e29f81f679
parent19dbca236cfc807ffd7c90322dcda158781c289b (diff)
downloadtigervnc-989dbd1ee9289bc486018fc53b576ed9dfe29d8c.tar.gz
tigervnc-989dbd1ee9289bc486018fc53b576ed9dfe29d8c.zip
If font catalogue exists (Fedora 11), use it as the initial font path
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3785 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rwxr-xr-xunix/vncserver3
1 files changed, 3 insertions, 0 deletions
diff --git a/unix/vncserver b/unix/vncserver
index 873e8db7..f22d63b5 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -88,6 +88,9 @@ if (CheckXFS(1)) {
$fontPath = "inet/:7100"; # Some Solaris systems require this
}
}
+if (-d "/etc/X11/fontpath.d") {
+ $fontPath = "catalogue:/etc/X11/fontpath.d";
+}
@fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/');
if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');}