[pytango] 218/483: Added LOG4TANGO_ROOT to configuration of include and lib directories in setup.py 2

[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 9ad14b42a3196d9244636940cd6e3440936685a5
Author: trogucki <trogucki at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Wed Jan 30 11:48:02 2013 +0000

    Added LOG4TANGO_ROOT to configuration of include and lib directories in setup.py 2
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@21989 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2e7a4fa..bef22e8 100644
--- a/setup.py
+++ b/setup.py
@@ -277,12 +277,13 @@ class install(dftinstall):
 
 
 def main():
-    LOG4TANGO_ROOT = BOOST_ROOT = OMNI_ROOT = TANGO_ROOT = '/usr'
+    ZMQ_ROOT = LOG4TANGO_ROOT = BOOST_ROOT = OMNI_ROOT = TANGO_ROOT = '/usr'
 
     TANGO_ROOT = os.environ.get('TANGO_ROOT', TANGO_ROOT)
     OMNI_ROOT  = os.environ.get('OMNI_ROOT', OMNI_ROOT)
     BOOST_ROOT = os.environ.get('BOOST_ROOT', BOOST_ROOT)
     LOG4TANGO_ROOT = os.environ.get('LOG4TANGO_ROOT', LOG4TANGO_ROOT)
+    ZMQ_ROOT = os.environ.get('ZMQ_ROOT', ZMQ_ROOT)
     numpy_c_include = get_c_numpy()
     
     Release = get_release_info()
@@ -382,6 +383,7 @@ def main():
         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':

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