From 9f9ce59d573e93e600b5ae5488fd7b6e2d2aef54 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Mon, 24 Aug 2009 09:34:08 +0000
Subject: [PATCH] Treat ICU_PATH relatively to current dir.

Also, fix another leading "/" bug.


[SVN r55756]
---
 build/Jamfile.v2 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 854ad300..1437e935 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -192,11 +192,18 @@ if [ check-icu-config ]
 if $(gHAS_ICU)
 {
    BOOST_REGEX_ICU_OPTS = "<target-os>freebsd:<include>/usr/local/include" ;
-   ICU_SEARCH_OPTS = "<target-os>freebsd:<search>/$(ICU_PATH)/lib" ; 
+   ICU_SEARCH_OPTS = "<target-os>freebsd:<search>$(ICU_PATH)/lib" ; 
    BOOST_REGEX_ICU_OPTS += "<define>BOOST_HAS_ICU=1" ;
    
    if $(ICU_PATH)
    {
+      # If ICU_PATH is specified on the command line, then it's
+      # relative to the current directory, while paths specified
+      # in a Jamfile are relative to that Jamfile. So, to
+      # avoid confusing the user if he's not running from
+      # libs/regex/build, explicitly root this.
+      ICU_PATH = [ path.native 
+          [ path.root [ path.make $(ICU_PATH) ] [ path.pwd ] ] ] ;
       if $(ICU_PATH) != "/usr" && $(ICU_PATH) != "/usr/local"
       {
          BOOST_REGEX_ICU_OPTS += "<include>$(ICU_PATH)/include" ;