diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-28 10:05:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-28 10:05:14 +0200 |
| commit | e75e0214134ca6ad92150bf6099c12d8859575b1 (patch) | |
| tree | 86be785b915c819d249f0948e26f9b751aa05352 /scp2 | |
| parent | dccf47b7f61e088622747539d1487590080da3b8 (diff) | |
Fix PYUNO_LOADER_PYTHONPATH for non-ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
Change-Id: Ifc164b80466d3b847ce1214c28a1ba79fdfd690b
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/python/profileitem_python.scp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp index e66eb1aa7602..64158fe34d88 100644 --- a/scp2/source/python/profileitem_python.scp +++ b/scp2/source/python/profileitem_python.scp @@ -41,7 +41,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework"; #elif defined MACOSX - Value = CONCAT2($ORIGIN,/LibreOfficePython.framework); + Value = "$ORIGIN/LibreOfficePython.framework"; #else Value = CONCAT2($ORIGIN/python-core-,PYVERSION); #endif @@ -54,37 +54,37 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath Section = "Bootstrap"; Order = 1; Key = "PYUNO_LOADER_PYTHONPATH"; -#ifdef SYSTEM_PYTHON + #if defined SYSTEM_PYTHON Value = "$ORIGIN"; -#else - #ifdef UNX - #ifdef MACOSX - #define FRAMEWORKLIB CONCAT3($ORIGIN,/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN) + #elif defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + #define FRAMEWORKLIB CONCAT2($ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN) Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB, /lib-dynload FRAMEWORKLIB, /lib-tk FRAMEWORKLIB, /site-packages $ORIGIN); - #else + #elif defined MACOSX + #define FRAMEWORKLIB CONCAT2($ORIGIN/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN) + Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB, + /lib-dynload FRAMEWORKLIB, + /lib-tk FRAMEWORKLIB, + /site-packages $ORIGIN); + #elif defined UNX Value = CONCAT9($ORIGIN/python-core-,PYVERSION, /lib $ORIGIN/python-core-,PYVERSION, /lib/lib-dynload $ORIGIN/python-core-,PYVERSION, /lib/lib-tk $ORIGIN/python-core-,PYVERSION, /lib/site-packages $ORIGIN); - #endif - #else - #ifdef _gcc3 + #elif defined _gcc3 Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION, /lib $ORIGIN/python-core-,PYVERSION, /lib/lib-dynload $ORIGIN/python-core-,PYVERSION, /lib/lib-tk $ORIGIN/python-core-,PYVERSION, /lib/site-packages $ORIGIN)); - #else + #else Value = STRING(CONCAT5($ORIGIN/python-core-,PYVERSION, /lib $ORIGIN/python-core-,PYVERSION, /lib/site-packages $ORIGIN)); - #endif #endif -#endif End // DISABLE_PYUNO |