diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:57:35 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:09 +0100 |
commit | 0443d0a90ecb9ac54484c1c2c6b9d74892eb35ae (patch) | |
tree | 14d96f096ee449348730e9bade2571cb23f46482 /instsetoo_native | |
parent | 379f978387a8b017a41c2682c0b39444f17a2230 (diff) |
normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONN
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
Diffstat (limited to 'instsetoo_native')
-rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 81d48b636035..a213f46fe58f 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -86,7 +86,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ printf '[Bootstrap]\n' && \ - $(if $(filter YES,$(SYSTEM_PYTHON)),, \ + $(if $(SYSTEM_PYTHON),, \ printf 'PYUNO_LOADER_PYTHONHOME=%s\n' \ $(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE), \ '$$ORIGIN/../Frameworks/LibreOfficePython.framework', \ @@ -94,7 +94,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ '$$ORIGIN/LibreOfficePython.framework', \ '$$ORIGIN/python-core-$(PYTHON_VERSION)')) &&) \ printf 'PYUNO_LOADER_PYTHONPATH=%s$$ORIGIN\n' \ - $(if $(filter YES,$(SYSTEM_PYTHON)), \ + $(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))) ', \ |