[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/PythonTest.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae993b043fe763585d85ca6ef4d99aaddffd2976
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Aug 18 22:18:05 2013 +0300

    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

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 539a961..f7678dc 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))))