Merge lp:~tim-greaves/spud/diamond-setup-py-fix2 into lp:spud

[Tim Greaves]

Suggested completion of the fix that Patrick applied to make the diamond install honour --prefix= supplied at the setup.py install stage as well as the prefix supplied to the initial libspud configure instance.

[Patrick Farrell (pefarrell)]

Does exactly what it says on the tin.

review: Approve

=== modified file 'diamond/setup.py.in'
--- diamond/setup.py.in	2011-07-12 11:24:31 +0000
+++ diamond/setup.py.in	2012-01-31 14:48:25 +0000
@@ -9,12 +9,32 @@
 except KeyError:
   destdir = ""
 
+prefix = None
+import sys
+for i, arg in enumerate(sys.argv):
+  if "--prefix" in arg:
+    prefix = arg.split('=')[1]
+    break
+
 # Get all the plugin directories we have
 plugin_dirs = [dir for dir in os.listdir('plugins') if os.path.isdir(os.path.join('plugins', dir)) and dir[0] != '.']
 plugin_data_files = []
 for plugin in plugin_dirs:
-  plugin_data_files.append((destdir + "@prefix@/share/diamond/plugins/" + plugin,
-    glob.glob('plugins/' + plugin + '/*.py')))
+  if prefix is None:
+    plugin_data_files.append((destdir + "@prefix@/share/diamond/plugins/" + plugin,
+      glob.glob('plugins/' + plugin + '/*.py')))
+  else:
+    plugin_data_files.append((destdir + "/" + prefix + "/share/diamond/plugins/" + plugin,
+      glob.glob('plugins/' + plugin + '/*.py')))
+
+# Consider whether we honour the configure or the setup prefix
+gui_data_files = []
+if prefix is None:
+  gui_data_files.append((destdir + "@prefix@/share/diamond/gui",
+    ["gui/gui.glade", "gui/diamond.svg"]))
+else:
+  gui_data_files.append((destdir + "/" + prefix + "/share/diamond/gui",
+    ["gui/gui.glade", "gui/diamond.svg"]))
 
 setup(
       name='diamond',
@@ -26,7 +46,6 @@
       packages = ['diamond'],
       package_dir = {'diamond': 'diamond'},
       scripts=["bin/diamond"],
-      data_files = [(destdir + "@prefix@/share/diamond/gui", ["gui/gui.glade", "gui/diamond.svg"])] +
-                   plugin_data_files
+      data_files = gui_data_files + plugin_data_files
      )