summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Lacko <backup.rlacko@gmail.com>2013-08-13 22:41:11 +0200
committerRoman Lacko <backup.rlacko@gmail.com>2013-08-13 22:41:11 +0200
commitb82bcd4598024359152723511a97db77b8e0c718 (patch)
treecebdb8362de412b679f5cd203f7dab10135cac8e
parent494d758aa60e3567f5abf17df9868c67aa70ce00 (diff)
Minor code cleanup
-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 3cae8997..ec8146ab 100644
--- a/pyside_postinstall.py
+++ b/pyside_postinstall.py
@@ -277,7 +277,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(os.path.join(pyside_path, "openssl"), dll)
+ src_path = 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 b16e971f..6229cc51 100644
--- a/setup.py
+++ b/setup.py
@@ -431,8 +431,8 @@ class pyside_build(_build):
script_dir = os.getcwd()
sources_dir = os.path.join(script_dir, "sources")
- build_dir = os.path.join(script_dir, os.path.join("pyside_build", "%s" % build_name))
- install_dir = os.path.join(script_dir, os.path.join("pyside_install", "%s" % build_name))
+ build_dir = os.path.join(script_dir, "pyside_build", "%s" % build_name)
+ install_dir = os.path.join(script_dir, "pyside_install", "%s" % build_name)
# Try to ensure that tools built by this script (such as shiboken)
# are found before any that may already be installed on the system.