diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 11:47:25 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 11:48:05 +0200 |
| commit | 6a61f4d58773db4095dbbaf21d61072a80bfd3b3 (patch) | |
| tree | d8fbc3f1cc66d9495439fc1b1b93057d3942a21e /instsetoo_native | |
| parent | 80e5e65c93a405f54089c59cf18e04486f9634b7 (diff) | |
Fix pythonloader.uno ini-file content
cf. scp2/source/python/profileitem_python.scp)
Change-Id: I49316ae078e56a961128bf59206843d0d616786e
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 603fcd387570..49f24033baaf 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -83,12 +83,24 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv : $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ - echo '[Bootstrap]' && \ - $(if $(filter YES,$(SYSTEM_PYTHON)),\ - echo PYUNO_LOADER_PYTHONPATH='$$ORIGIN',\ - echo PYUNO_LOADER_PYTHONHOME='$$ORIGIN/python-core-$(PYTHON_VERSION)' && \ - echo PYUNO_LOADER_PYTHONPATH='$(foreach dir,lib lib/lib-dynload lib/lib-tk lib/site-packages,$$ORIGIN/python-core-$(PYTHON_VERSION)/$(dir)) $$ORIGIN' \ - ) \ + printf '[Bootstrap]\n' && \ + $(if $(filter YES,$(SYSTEM_PYTHON)),, \ + printf 'PYUNO_LOADER_PYTHONHOME=%s\n' \ + $(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE), \ + '$$ORIGIN/../Frameworks/LibreOfficePython.framework', \ + $(if $(filter MACOSX,$(OS)), \ + '$$ORIGIN/LibreOfficePython.framework', \ + '$$ORIGIN/python-core-$(PYTHON_VERSION)')) &&) \ + printf 'PYUNO_LOADER_PYTHONPATH=%s$$ORIGIN\n' \ + $(if $(filter YES,$(SYSTEM_PYTHON)), \ + '', \ + $(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE), \ + '$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir))) ', \ + $(if $(filter MACOSX,$(OS)), \ + '$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir))) ', \ + $(if $(filter WNTMSC,$(OS)$(COM)), \ + '$(foreach dir,/ /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ', \ + '$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/$(dir))) ')))) \ ) > $@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) : |