summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-06-04 15:53:28 +0200
committerDavid Tardon <dtardon@redhat.com>2013-06-04 15:55:49 +0200
commit424e936fc095c676a24c04acdd1eb1fbb6a27bed (patch)
tree1ba4a3243221fc44448b66778a6b16625ac50658
parentc73a65db14f8ee57e382a04b0d38a704c0308458 (diff)
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
-rw-r--r--python3/ExternalPackage_python3.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index abe7ac742b72..597062cd3f80 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 \