summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-18 22:18:05 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-18 22:19:45 +0300
commitae993b043fe763585d85ca6ef4d99aaddffd2976 (patch)
tree133c98e2c6aa5257096b4a0621a61bd604b0ede9 /solenv
parent2fac457566eb6fd33d05c3c8d27050b773db6fd2 (diff)
Add where pyuno.so is to PYPATH for the "Mac-like app structure" case
In that case, the .py files are in Resources while pyuno.so is in Frameworks. Or maybe I should put pyuno.so in Resources. too. Change-Id: Iec453c378defdc45d6d3ba6bd17b2a86de669d29
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/PythonTest.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 539a961f4a16..f7678dcb878c 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -56,7 +56,7 @@ $(call gb_PythonTest_get_target,%) :
# always use udkapi and URE services
define gb_PythonTest_PythonTest
-$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/$(LIBO_LIB_PYUNO_FOLDER)
+$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/$(LIBO_LIB_PYUNO_FOLDER)$(if $(filter-out $(LIBO_LIB_PYUNO_FOLDER),$(LIBO_LIB_FOLDER)),$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/$(LIBO_LIB_FOLDER))
$(call gb_PythonTest_get_target,$(1)) : MODULES :=
$(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1))))