Merge branch 'system-wide-config' of https://github.com/jblaine/tigervnc

diff --cc unix/vncserver
index 674eadad17ae20a2a9a4e9f60c2e364d2a9e8080,f12df578c76df506cbc8c35a055404d721d60885..6c29a7557cfbb423eb1433314b21415d69f39186
--- 1/unix/vncserver
--- 2/unix/vncserver
+++ b/unix/vncserver
@@@ -359,12 -371,11 +371,11 @@@ if (! $skipxstartup) 
  }
  
  # Create the user's config file if necessary.
- 
  if (!(-e "$vncUserDir/config")) {
      warn "Creating default config $vncUserDir/config\n";
 -    open(XSTARTUP, ">$vncUserDir/config");
 -    print XSTARTUP $defaultConfig;
 -    close(XSTARTUP);
 +    open(VNCUSERCONFIG, ">$vncUserDir/config");
 +    print VNCUSERCONFIG $defaultConfig;
 +    close(VNCUSERCONFIG);
      chmod 0644, "$vncUserDir/config";
  }
  
@@@ -387,9 -397,11 +397,9 @@@ if (-e "/tmp/.X11-unix/X$displayNumber
  }
  $ENV{VNCDESKTOP}= $desktopName;
  
 -system($exedir."vncconfig -nowin >> " . &quotedString($desktopLog) . " 2>&1 &");
 -
  if ($opt{'-fg'}) {
      if (! $skipxstartup) {
-         system("$xstartup >> " . &quotedString($desktopLog) . " 2>&1");
+         system("$xstartupFile >> " . &quotedString($desktopLog) . " 2>&1");
      }
      if (kill 0, `cat $pidFile`) {
          $opt{'-kill'} = ':'.$displayNumber;