aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Lacko <backup.rlacko@gmail.com>2013-05-17 12:22:31 +0200
committerRoman Lacko <backup.rlacko@gmail.com>2013-05-17 12:22:31 +0200
commit9d53817b1a491207ae92091678ae38773e447c31 (patch)
tree7700f23487288a9ae7219021948433d9ebd63701
parentc78570bea949a45839199f7914392307cd5c6a47 (diff)
Distribute OpenSSL DLLs in openssl subfolder
-rw-r--r--pyside_postinstall.py2
-rw-r--r--setup.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/pyside_postinstall.py b/pyside_postinstall.py
index 1d162ac9..f4dfba1f 100644
--- a/pyside_postinstall.py
+++ b/pyside_postinstall.py
@@ -272,7 +272,7 @@ Translations = %(pyside_prefix)s/translations
# Install OpenSSL libs
for dll in ["libeay32.dll", "ssleay32.dll"]:
dest_path = os.path.join(exec_prefix, dll)
- src_path = os.path.join(pyside_path, dll)
+ src_path = os.path.join(os.path.join(pyside_path, "openssl"), dll)
if not os.path.exists(dest_path) and os.path.exists(src_path):
shutil.copy(src_path, dest_path)
file_created(dest_path)
diff --git a/setup.py b/setup.py
index 13ee5ee8..ebf4910b 100644
--- a/setup.py
+++ b/setup.py
@@ -743,8 +743,8 @@ class pyside_build(_build):
"{sources_dir}/pyside-examples/examples",
"{dist_dir}/PySide/examples",
force=False, logger=log, vars=vars)
- # <ssl_libs>/* -> <setup>/PySide/
- copydir("{ssl_libs_dir}", "{dist_dir}/PySide",
+ # <ssl_libs>/* -> <setup>/PySide/openssl
+ copydir("{ssl_libs_dir}", "{dist_dir}/PySide/openssl",
filter=[
"libeay32.dll",
"ssleay32.dll"],