[pytango] 219/483: Modified setup.py to take into account lib64

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 1f8cf82f3b3739dea1ece4412d54b6a622149738
Author: trogucki <trogucki at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Wed Jan 30 17:02:46 2013 +0000

    Modified setup.py to take into account lib64
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@22000 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 setup.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index bef22e8..a2ab9f4 100644
--- a/setup.py
+++ b/setup.py
@@ -379,12 +379,14 @@ def main():
     if not has_numpy():
         macros.append( ('DISABLE_PYTANGO_NUMPY', None) )
 
-    library_dirs = [
-        os.path.join(TANGO_ROOT, 'lib'),
-        os.path.join(BOOST_ROOT, 'lib'),
-        os.path.join(LOG4TANGO_ROOT, 'lib'),
-        os.path.join(ZMQ_ROOT, 'lib'),
-    ]
+    #library_dirs = [os.path.join(f,'lib' if os.stat(os.path.join(f,'lib')) else 'lib64') for f in (TANGO_ROOT,BOOST_ROOT,LOG4TANGO_ROOT,ZMQ_ROOT)]
+    library_dirs = [(d if os.stat(d) else d.replace('lib','lib64')) for d in (os.path.join(f,'lib') for f in (TANGO_ROOT,BOOST_ROOT,LOG4TANGO_ROOT,ZMQ_ROOT))]
+#    library_dirs = [
+#        os.path.join(TANGO_ROOT, 'lib'),
+#        os.path.join(BOOST_ROOT, 'lib'),
+#        #os.path.join(LOG4TANGO_ROOT, 'lib'),
+#        os.path.join(ZMQ_ROOT, 'lib'),
+#    ]                                
 
     if os.name == 'nt':
         include_dirs += [ BOOST_ROOT ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git