python3/ExternalPackage_python3.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 424e936fc095c676a24c04acdd1eb1fbb6a27bed
Author: David Tardon <dtar...@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
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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
