From 43825413c756d51ad8a4ea704d8ff50065282f35 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 3 May 2002 04:43:37 +0000
Subject: [PATCH] Fixed find-jamfile prunning to given directory root.

[SVN r13630]
---
 new/project.jam      | 6 +++++-
 v2/build/project.jam | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/new/project.jam b/new/project.jam
index 6f3f5cf3f..ba82da21c 100644
--- a/new/project.jam
+++ b/new/project.jam
@@ -222,6 +222,10 @@ local rule find-jamfile (
     # Normalize the paths of each file found.
     #
     local jamfile-found = ;
+    if $(parent-root)
+    {
+        parent-root = [ os.path.make $(parent-root) ] ;
+    }
     for local jamfile in $(jamfile-glob)
     {
         local normalized = [ os.path.make $(jamfile) ] ;
@@ -231,7 +235,7 @@ local rule find-jamfile (
         # Filter out if the found file is above the target parent root.
         if $(parent-root)
         {
-            if ! [ MATCH "$(parent-root)\\$(SLASH)(.*)" : $(normalized) ]
+            if ! [ MATCH "$(parent-root)\\/(.*)" : $(normalized) ]
             {
                 normalized = ;
             }
diff --git a/v2/build/project.jam b/v2/build/project.jam
index 6f3f5cf3f..ba82da21c 100644
--- a/v2/build/project.jam
+++ b/v2/build/project.jam
@@ -222,6 +222,10 @@ local rule find-jamfile (
     # Normalize the paths of each file found.
     #
     local jamfile-found = ;
+    if $(parent-root)
+    {
+        parent-root = [ os.path.make $(parent-root) ] ;
+    }
     for local jamfile in $(jamfile-glob)
     {
         local normalized = [ os.path.make $(jamfile) ] ;
@@ -231,7 +235,7 @@ local rule find-jamfile (
         # Filter out if the found file is above the target parent root.
         if $(parent-root)
         {
-            if ! [ MATCH "$(parent-root)\\$(SLASH)(.*)" : $(normalized) ]
+            if ! [ MATCH "$(parent-root)\\/(.*)" : $(normalized) ]
             {
                 normalized = ;
             }