From bc37c967a6d7dba0fa5281471dcadfbbba416ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Sat, 25 Aug 2012 16:09:31 +0000
Subject: [PATCH] Updated Boost Jam's internal build system to correctly
 recognize header changes when using same-named headers located in different
 folders.

[SVN r80208]
---
 v2/engine/build.jam | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/v2/engine/build.jam b/v2/engine/build.jam
index 0e4296d00..8cc37f9ef 100644
--- a/v2/engine/build.jam
+++ b/v2/engine/build.jam
@@ -800,11 +800,14 @@ rule .scan ( targets + )
 rule .hdr.scan ( target : includes * : binding )
 {
     local target-path = [ NORMALIZE_PATH $(binding:D) ] ;
-    NOCARE $(includes) ;
-    INCLUDES $(target) : $(includes) ;
-    SEARCH on $(includes) = $(target-path) ;
-    ISFILE $(includes) ;
-    .scan $(includes) ;
+    # Extra grist provides target name uniqueness when referencing same name
+    # header files from different folders.
+    local include-targets = <$(target-path)>$(includes) ;
+    NOCARE $(include-targets) ;
+    INCLUDES $(target) : $(include-targets) ;
+    SEARCH on $(include-targets) = $(target-path) ;
+    ISFILE $(include-targets) ;
+    .scan $(include-targets) ;
 }
 .scan $(jam.source) ;