[Boost-commit] svn:boost r55756 - trunk/libs/regex/build

Subject: [Boost-commit] svn:boost r55756 - trunk/libs/regex/build
From: ghost_at_[hidden]
Date: 2009-08-24 05:34:09

Author: vladimir_prus
Date: 2009-08-24 05:34:08 EDT (Mon, 24 Aug 2009)
New Revision: 55756
URL: http://svn.boost.org/trac/boost/changeset/55756

Log:
Treat ICU_PATH relatively to current dir. 

Also, fix another leading "/" bug.

Text files modified: 
   trunk/libs/regex/build/Jamfile.v2 |     9 ++++++++-                               
   1 files changed, 8 insertions(+), 1 deletions(-)

Modified: trunk/libs/regex/build/Jamfile.v2
==============================================================================
--- trunk/libs/regex/build/Jamfile.v2	(original)
+++ trunk/libs/regex/build/Jamfile.v2	2009-08-24 05:34:08 EDT (Mon, 24 Aug 2009)
@@ -192,11 +192,18 @@
 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" ;