From 75de05efec50accd547a95a169ad438ec1bd2593 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Sun, 4 Apr 2010 21:04:48 +0000
Subject: [PATCH] Disambiguiate targets and directories passed to
 'build-project'.

Previously, if a Jamfile had:
    exe a : a.cpp ;
    build-project a ;
where a is also a subdirectory, we'd get error.


[SVN r61054]
---
 v2/build/targets.jam | 2 +-
 v2/test/build_dir.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/v2/build/targets.jam b/v2/build/targets.jam
index 2c9b64154..f988e691b 100644
--- a/v2/build/targets.jam
+++ b/v2/build/targets.jam
@@ -288,7 +288,7 @@ class project-target : abstract-target
         local self-location = [ get location ] ;
         for local pn in [ get projects-to-build ]
         {
-            result += [ find $(pn) ] ;
+            result += [ find $(pn)/ ] ;
         }
 
         return $(result) ;
diff --git a/v2/test/build_dir.py b/v2/test/build_dir.py
index efdd522a4..c5bcbc5b9 100644
--- a/v2/test/build_dir.py
+++ b/v2/test/build_dir.py
@@ -36,6 +36,7 @@ t.expect_addition(["build/$toolset/debug/a.exe",
 
 # Test that building from child projects work.
 t.run_build_system(subdir='src')
+t.ignore("build/config.log")
 t.expect_nothing_more()
 
 # Test that project can override build dir.