From 84fa4e2c8841c63e4c028a5caf8aa8f8067d67cc Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Tue, 10 Dec 2002 07:15:33 +0000
Subject: [PATCH] Bugfix: path features in target requirement were not
 translated.

* test/path_features.py: Fix a bug in test.

* new/targets.jam
    (main-target-requirements): Bugfix.


[SVN r16579]
---
 new/targets.jam          | 2 +-
 test/path_features.py    | 5 ++++-
 v2/build/targets.jam     | 2 +-
 v2/test/path_features.py | 5 ++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/new/targets.jam b/new/targets.jam
index e03b39bd8..f9123ba91 100644
--- a/new/targets.jam
+++ b/new/targets.jam
@@ -569,7 +569,7 @@ rule main-target-requirements (
     local loc = [ project.attribute $(project) location ] ;
     local requirements = [ property.translate-paths $(specification) : $(loc) ] ; 
     local project-requirements = [ project.attribute $(project) requirements ] ;
-    requirements = [ property.refine $(project-requirements) : $(specification) ] ;
+    requirements = [ property.refine $(project-requirements) : $(requirements) ] ;
     if $(requirements[1]) = "@error" 
     {
         errors.error "Conflicting requirements for target:" $(requirements) ;
diff --git a/test/path_features.py b/test/path_features.py
index 6a2276009..975947387 100644
--- a/test/path_features.py
+++ b/test/path_features.py
@@ -5,7 +5,10 @@ t = Tester()
 
 t.write("project-root.jam", "import gcc ;")
 t.write("Jamfile", "lib a : a.cpp : <include>. ;")
-t.write("a.cpp", "void foo() {}")
+t.write("a.cpp", """
+#include <a.h>
+void foo() {}
+""")
 t.write("a.h", "")
 
 t.write("d/Jamfile", "exe b : b.cpp ../a ; ")
diff --git a/v2/build/targets.jam b/v2/build/targets.jam
index e03b39bd8..f9123ba91 100644
--- a/v2/build/targets.jam
+++ b/v2/build/targets.jam
@@ -569,7 +569,7 @@ rule main-target-requirements (
     local loc = [ project.attribute $(project) location ] ;
     local requirements = [ property.translate-paths $(specification) : $(loc) ] ; 
     local project-requirements = [ project.attribute $(project) requirements ] ;
-    requirements = [ property.refine $(project-requirements) : $(specification) ] ;
+    requirements = [ property.refine $(project-requirements) : $(requirements) ] ;
     if $(requirements[1]) = "@error" 
     {
         errors.error "Conflicting requirements for target:" $(requirements) ;
diff --git a/v2/test/path_features.py b/v2/test/path_features.py
index 6a2276009..975947387 100644
--- a/v2/test/path_features.py
+++ b/v2/test/path_features.py
@@ -5,7 +5,10 @@ t = Tester()
 
 t.write("project-root.jam", "import gcc ;")
 t.write("Jamfile", "lib a : a.cpp : <include>. ;")
-t.write("a.cpp", "void foo() {}")
+t.write("a.cpp", """
+#include <a.h>
+void foo() {}
+""")
 t.write("a.h", "")
 
 t.write("d/Jamfile", "exe b : b.cpp ../a ; ")