[Libreoffice-commits] core.git: scp2/source

[Rene Engelhard]

 scp2/source/python/module_python.scp |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 2f531243f35e0d311d2eaca54d8c06750a1ac23e
Author: Rene Engelhard <rene at debian.org>
Date:   Sat May 31 20:31:17 2014 +0200

    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

diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 26c16b1..a4a152a 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,