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

[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 eaa5f98982eacba107212e9d7bd8f469fda4ebc0
Author: trogucki <trogucki at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Thu Jan 31 13:53:49 2013 +0000

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

diff --git a/setup.py b/setup.py
index 2d6730d..8eca70c 100644
--- a/setup.py
+++ b/setup.py
@@ -391,7 +391,6 @@ def main():
             except: d = os.path.join(f,'lib')
         library_dirs.append(d)
             
-    print('library_dirs: %s'%library_dirs)
 #    library_dirs = [
 #        os.path.join(TANGO_ROOT, 'lib'),
 #        os.path.join(BOOST_ROOT, 'lib'),
@@ -474,7 +473,14 @@ def main():
                 boost_library_name += pyver
         libraries.append(boost_library_name)
 
-        library_dirs += [ os.path.join(OMNI_ROOT, 'lib') ]
+        is64 = 8 * struct.calcsize("P") == 64
+        omni_lib = os.path.join(OMNI_ROOT, 'lib')
+        if is64:
+            omni_lib = os.path.join(OMNI_ROOT, 'lib64')
+            try: 
+                if not os.stat(d): raise Exception('%s_doesnt_exist'%d)
+            except: omni_lib = os.path.join(OMNI_ROOT, 'lib')
+        library_dirs += [ omni_lib ]
 
 
         # Note for PyTango developers:

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