--- mstation.py.orig	2010-01-15 14:36:13.000000000 +0100
+++ mstation.py	2011-04-15 23:54:33.818546856 +0200
@@ -17,6 +17,7 @@
 ***********************************************************/
 """
 import os,sys,string,time
+sys.path.append('/usr/share/games/multiplicationstation/lib')
 from MultiplicationStation.mstation import *
 
 def usage():
--- MultiplicationStation/mstation.py.orig	2010-10-26 15:05:43.000000000 +0200
+++ MultiplicationStation/mstation.py	2011-04-17 18:07:55.200020894 +0200
@@ -800,7 +800,7 @@ class MultiplicationStation:
		infname=os.path.join(homedir,'.mstation_config')
		
		if not os.path.exists(infname):
-			master_fname=os.path.join(self.env.fontdir,'.mstation_config_master')
+			master_fname=os.path.join('/','usr','share','games','multiplicationstation','.mstation_config_master')
 			if self.env.OS=='win':
 				cmd="copy %s \"%s\""%(master_fname,os.path.join(homedir,'.mstation_config'))
				if DEBUG:print cmd
 				os.system(cmd)
--- MultiplicationStation/environment.py.orig	2011-04-20 18:20:34.746386359 +0200
+++ MultiplicationStation/environment.py	2011-04-20 18:22:38.055815547 +0200
@@ -35,10 +35,9 @@ class Environment:
 		
 		if OS=='lin':
 			import pygame 
-			for sitepkgdir in sys.path:
-				if sitepkgdir[-13:]=='site-packages':break
-			configdir=os.getenv('HOME')
-			fontdir=os.path.join('/','var','games',appname)#,os.path.basename(appname)
+			sitepkgdir=os.path.join('/','usr','share','games','multiplicationstation', 'lib')
+			configdir=os.path.join('/','usr','share','games','multiplicationstation')#,os.path.basename(appname)
+			fontdir=os.path.join('/','usr','share','games','multiplicationstation')#,os.path.basename(appname)
 			homedir=os.getenv('HOME')
 		
 		elif OS=='win':
@@ -55,21 +54,6 @@ class Environment:
 			fontdir='.'
 			homedir=os.getenv('HOME')
 		
-		#If application hasn't been installed (via setup.py) then try to run from tgz directory:
-		if os.path.exists(appname) and os.path.exists('mstation.py'):#if yes, then probably want to be running w/o installing.
-			sitepkgdir='.'
-			fontdir='.'
-			configdir='.'
-			homedir=os.getenv('HOME')
-			if not homedir:homedir=os.getenv('USERPROFILE')
-		elif os.path.exists(os.path.join(sitepkgdir,appname,'mstation.py')):pass
-		elif os.path.exists(os.path.join(sitepkgdir,appname,'mstation.py')) and OS=='win':pass
-		else:
-			sitepkgdir='.'
-			fontdir='.'
-			configdir='.'
-			homedir=os.getenv('HOME')
-			if not homedir:homedir=os.getenv('USERPROFILE')
 		self.OS=OS
 		self.sitepkgdir=sitepkgdir
 		self.fontdir=fontdir