From 47f3e6fb655be3ca8f751c49205bcc6e927f4f93 Mon Sep 17 00:00:00 2001 From: Brian Gerkey Date: Sat, 29 Jan 2011 19:23:11 +0000 Subject: [PATCH] reverted r12809; see #2999 --- tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py b/tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py index c642e6f9..e804bac3 100755 --- a/tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py +++ b/tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py @@ -177,13 +177,13 @@ def find_boost(search_paths): return result[-1] def search_paths(sysroot): - _search_paths = [(None if 'ROS_BOOST_ROOT' not in os.environ else os.environ['ROS_BOOST_ROOT'], False), + _search_paths = [(sysroot+'/usr', True), + (sysroot+'/usr/local', True), (None if 'INCLUDE_DIRS' not in os.environ else os.environ['INCLUDE_DIRS'], True), (None if 'CPATH' not in os.environ else os.environ['CPATH'], True), (None if 'C_INCLUDE_PATH' not in os.environ else os.environ['C_INCLUDE_PATH'], True), (None if 'CPLUS_INCLUDE_PATH' not in os.environ else os.environ['CPLUS_INCLUDE_PATH'], True), - (sysroot+'/usr', True), - (sysroot+'/usr/local', True)] + (None if 'ROS_BOOST_ROOT' not in os.environ else os.environ['ROS_BOOST_ROOT'], False)] search_paths = [] for (str, system) in _search_paths: