summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2014-05-31 20:31:17 +0200
committerRene Engelhard <rene@debian.org>2014-05-31 20:31:17 +0200
commit2f531243f35e0d311d2eaca54d8c06750a1ac23e (patch)
treea31b49ba20a58049e2c32ca81fadf1cfefe7e90e /scp2
parent70b0634dc2527c09e85799186922fcdbca7c9b48 (diff)
fix pyuno.so install to correctly end up in gid_Module_Pyuno
... as the (empty in this case) auto_python_ALL makes the second entry ignored Change-Id: I1b39595b3ab8da429f45f49098d6fc7bdc4c1cba
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/python/module_python.scp8
1 files changed, 7 insertions, 1 deletions
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 26c16b14f9d9..a4a152a815bd 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -38,7 +38,13 @@ Module gid_Module_Pyuno
gid_Dir_Py_PythonCore,
gid_Dir_Py_PythonCore_Bin,
gid_Dir_Py_PythonCore_Lib);
- Files = (auto_python_ALL,
+/* right now auto_python_ALL just seems to contain the python core, which we don't need
+ with system-python - and if this is empty the next one (gid_File_Pyuno) apparently doesn't
+ correctly end up here. */
+ Files = (
+#ifndef SYSTEM_PYTHON
+ auto_python_ALL,
+#endif
gid_File_Pyuno,
gid_File_Pyuno_Rdb,
gid_File_Lib_Pyuno,