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

[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 41d701c464cd63619f4c8961f9cf90e7714d9beb
Author: trogucki <trogucki at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Wed Jan 30 17:52:25 2013 +0000

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

diff --git a/setup.py b/setup.py
index ffe7dc0..5e639d9 100644
--- a/setup.py
+++ b/setup.py
@@ -379,8 +379,14 @@ def main():
     if not has_numpy():
         macros.append( ('DISABLE_PYTANGO_NUMPY', None) )
 
-    #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 = []
+    for f in (TANGO_ROOT,BOOST_ROOT,LOG4TANGO_ROOT,ZMQ_ROOT):
+        d = os.path.join(f,'lib')
+        try: 
+            if not os.stat(d): raise Exception('%s_doesnt_exists'%d)
+        except: d.replace('lib','lib64')
+        library_dirs.append(d)
+            
     print('library_dirs: %s'%library_dirs)
 #    library_dirs = [
 #        os.path.join(TANGO_ROOT, 'lib'),

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