[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - python3/ExternalPackage_python3.mk

[David Tardon]

 python3/ExternalPackage_python3.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8151270d24db4a3e813fbd76ead374e93c875da
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jun 4 15:53:28 2013 +0200

    fdo#65305 fix python on win
    
    Apparently the native modules (.pyd) are expected directly in lib, not
    in lib/lib-dynload like the .so's on linux.
    
    Change-Id: Ic3181f189d9db51cb57630c4c1ea8741bbf879ec
    (cherry picked from commit 424e936fc095c676a24c04acdd1eb1fbb6a27bed)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index abe7ac7..597062c 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/p
 ifeq ($(MSVC_USE_DEBUG_RUNTIME),)
 $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll))
 endif
-$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\
+$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
 	LO_lib/$(python_arch_subdir)_ctypes$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
 	LO_lib/$(python_arch_subdir)_ctypes_test$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
 	LO_lib/$(python_arch_subdir)_decimal$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \