[pytango] 323/483: fix minor errors

[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 ba1c29714758648f6e6055b1bed3425dd11aec25
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Mon Nov 25 12:31:18 2013 +0000

    fix minor errors
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24358 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 setup.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/setup.py b/setup.py
index a498ae7..fe7baf0 100644
--- a/setup.py
+++ b/setup.py
@@ -156,17 +156,16 @@ def add_lib(name, dirs, sys_libs, env_name=None, lib_name=None, inc_suffix=None)
         inc_dir = os.path.join(ENV, 'include')
         if inc_suffix is not None:
             inc_dir = os.path.join(inc_dir, inc_suffix)
+        lib_dirs = [os.path.join(ENV, 'lib')]
         if is64:
-            lib_dir = os.path.join(ENV, 'lib64')
-            if not os.path.isdir(lib_dir):
-                lib_dir = os.path.join(ENV, 'lib')
-        else:
-            lib_dir = os.path.join(ENV, 'lib')
+            lib64_dir = os.path.join(ENV, 'lib64')
+            if os.path.isdir(lib64_dir):
+                lib_dirs.insert(0, lib64_dir)
         
         if lib_name.startswith('lib'):
             lib_name = lib_name[3:]
         dirs['include_dirs'].append(inc_dir)
-        dirs['library_dirs'].append(lib_dir)
+        dirs['library_dirs'].extend(lib_dir)
         dirs['libraries'].append(lib_name)
 
         
@@ -339,8 +338,7 @@ def main():
     add_lib('omni', directories, sys_libs, lib_name='omniORB4')
     add_lib('zmq', directories, sys_libs, lib_name='libzmq')
     add_lib('tango', directories, sys_libs, inc_suffix='tango')
-    add_lib('log4tango', directories, sys_libs)
-    add_lib('tango', directories, sys_libs, inc_suffix='tango')
+
     # special boost-python configuration
 
     BOOST_ROOT = os.environ.get('BOOST_ROOT')
@@ -357,14 +355,14 @@ def main():
                 boost_library_name += pyver
     else:
         inc_dir = os.path.join(BOOST_ROOT, 'include')
-        lib_dir = os.path.join(BOOST_ROOT, 'lib')
+        lib_dirs = [os.path.join(BOOST_ROOT, 'lib')]
         if is64:
-            lib_dir = os.path.join(BOOST_ROOT, 'lib64')
-            if not os.path.isdir(lib_dir):
-                lib_dir = os.path.join(BOOST_ROOT, 'lib')                
+            lib64_dir = os.path.join(BOOST_ROOT, 'lib64')
+            if os.path.isdir(lib64_dir):
+                lib_dirs.insert(0, lib64_dir)
 
         directories['include_dirs'].append(inc_dir)
-        directories['library_dirs'].append(lib_dir)
+        directories['library_dirs'].extend(lib_dirs)
                 
     directories['libraries'].append(boost_library_name)
 

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