--- setup.py	2005-02-18 04:51:06.000000000 +0100
+++ setup.py.1	2005-02-20 22:51:31.687411720 +0100
@@ -10,20 +10,14 @@
 # Read off the PREFIX value, so we can tell jools where to find its
 # data files (FIXME: is there a clean way to handle this through distutils?
 if 'sdist' not in sys.argv and 'clean' not in sys.argv:
-   PREFIX=os.path.normpath(sys.prefix)  # default
+   DATA_PREFIX=""  # default
    for arg in sys.argv:
-      index = string.find(arg, "--prefix=")
+      index = string.find(arg, "--install-data=")
       if index > -1:
-         PREFIX = os.path.normpath(arg[(index+len("--prefix=")):])
-
-   ROOT = "/"  # default
-   for arg in sys.argv:
-      index = string.find(arg, "--root=")
-      if index > -1:
-         ROOT = os.path.normpath(arg[(index+len("--root=")):])
+         DATA_PREFIX = os.path.normpath(arg[(index+len("--install-data=")):])
 
    config = open("londonlaw/common/config.py", "w")
-   config.write("MEDIAROOT = \"" + os.path.join(PREFIX,"share/londonlaw/guiclient") + "\"\n")
+   config.write("MEDIAROOT = \"" + os.path.join(DATA_PREFIX,"londonlaw/guiclient") + "\"\n")
    config.close()
 
 
@@ -37,7 +31,8 @@
          if os.path.isfile(fullFile):
             newFiles.append(fullFile)
    if newFiles != []:
-      installList.append( (os.path.join('share', dirname), newFiles) )
+#      installList.append( (os.path.join('share', dirname), newFiles) )
+      installList.append( (dirname, newFiles) )
 
 
 # Get all data files by walking through the proper directory trees