From 93253fa987cb6395aba8b45fde3849f89944af6b Mon Sep 17 00:00:00 2001
From: Robin Dunn <rdunn@enthought.com>
Date: Mon, 29 Apr 2013 15:06:19 -0700
Subject: Fix some setup_dir --> dist_dir that were missed in the rebase.

---
 setup.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index ef87e6e7a..f1f336c39 100644
--- a/setup.py
+++ b/setup.py
@@ -721,7 +721,7 @@ class pyside_build(_build):
         if self.debug or self.build_type == 'RelWithDebInfo':
             copyfile(
                 "{build_dir}/shiboken/shibokenmodule/shiboken{dbgPostfix}.pdb",
-                "{setup_dir}/PySide/shiboken{dbgPostfix}.pdb",
+                "{dist_dir}/PySide/shiboken{dbgPostfix}.pdb",
                 logger=log, vars=vars)        
         # <install>/lib/site-packages/pysideuic/* -> <setup>/pysideuic
         copydir(
@@ -789,25 +789,25 @@ class pyside_build(_build):
 
         if self.debug  or self.build_type == 'RelWithDebInfo':
             # <qt>/lib/*.pdb -> <setup>/PySide
-            copydir("{qt_lib_dir}", "{setup_dir}/PySide",
+            copydir("{qt_lib_dir}", "{dist_dir}/PySide",
                 filter=["*.pdb"],
                 recursive=False, logger=log, vars=vars)
             
         # I think these are the qt-mobility DLLs, at least some are,
         # so let's copy them too
         # <qt>/lib/*.dll -> <setup>/PySide
-        copydir("{qt_lib_dir}", "{setup_dir}/PySide",
+        copydir("{qt_lib_dir}", "{dist_dir}/PySide",
             filter=["*.dll"],
             ignore=["*d?.dll"],
             recursive=False, logger=log, vars=vars)
         if self.debug:
             # <qt>/lib/*d4.dll -> <setup>/PySide
-            copydir("{qt_lib_dir}", "{setup_dir}/PySide",
+            copydir("{qt_lib_dir}", "{dist_dir}/PySide",
                 filter=["*d?.dll"],
                 recursive=False, logger=log, vars=vars)
         if self.debug  or self.build_type == 'RelWithDebInfo':
             # <qt>/lib/*pdb -> <setup>/PySide
-            copydir("{qt_lib_dir}", "{setup_dir}/PySide",
+            copydir("{qt_lib_dir}", "{dist_dir}/PySide",
                 filter=pdbs,
                 recursive=False, logger=log, vars=vars)
         
-- 
cgit v1.2.3