diff options
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 48c264bd2ee6..cd8fd6512900 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -88,21 +88,17 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ printf '[Bootstrap]\n' && \ $(if $(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)')) &&) \ + '$$ORIGIN/../Frameworks/LibreOfficePython.framework', \ + '$$ORIGIN/python-core-$(PYTHON_VERSION)') &&) \ printf 'PYUNO_LOADER_PYTHONPATH=%s$$ORIGIN\n' \ $(if $(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))) ', \ + '$(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 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)/lib$(dir))) ')))) \ + '$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) '))) \ ) > $@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) : |