Fix font and color paths for Ubuntu 8

git-svn-id: svn+ssh://svn.code.sf.net/p/turbovnc/code/trunk@824 799e4f7b-5fd2-41f6-823c-2ecc41bc7f0b
TurboVNC · Nov 25, 2008 · dcd77a7 · dcd77a7
1 parent cc27982
commit dcd77a7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/vnc_unixsrc/vncserver b/vnc_unixsrc/vncserver
@@ -135,7 +135,7 @@ unless ($xauthorityFile) {
 chop($host = `uname -n`);
 chop($os = `uname`);
 
-@fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts');
+@fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/');
 if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');}
 if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');}
 if (! -l "/usr/openwin") {push(@fontpaths, '/usr/openwin/lib/X11/fonts');}
@@ -180,6 +180,8 @@ if (-f "/usr/lib/X11/rgb.txt") {
     $colorPath = "/usr/openwin/lib/X11/rgb";
 } elsif (-f "/usr/X11R6/lib/X11/rgb.txt") {
     $colorPath = "/usr/X11R6/lib/X11/rgb";
+} elsif (-f "/usr/share/X11/rgb.txt") {
+    $colorPath = "/usr/share/X11/rgb";
 }
 
 # Check command line options