From 9d53817b1a491207ae92091678ae38773e447c31 Mon Sep 17 00:00:00 2001
From: Roman Lacko <backup.rlacko@gmail.com>
Date: Fri, 17 May 2013 12:22:31 +0200
Subject: Distribute OpenSSL DLLs in openssl subfolder

---
 pyside_postinstall.py | 2 +-
 setup.py              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyside_postinstall.py b/pyside_postinstall.py
index 1d162ac91..f4dfba1fe 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 13ee5ee86..ebf4910be 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"],
-- 
cgit v1.2.3