From e5eda1bc19ae2ef6d5656369868602e628000ce8 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Fri, 19 May 2006 09:10:22 +0000
Subject: [PATCH] Merge from trunk

[SVN r34023]
---
 src/build/targets.jam | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/build/targets.jam b/src/build/targets.jam
index cab4436e1..91e992ebe 100644
--- a/src/build/targets.jam
+++ b/src/build/targets.jam
@@ -281,9 +281,7 @@ class project-target : abstract-target
         local self-location = [ get location ] ;
         for local pn in [ get projects-to-build ]
         {
-            local p = [ project.module-name 
-                [ path.root $(pn) $(self-location) ] ] ;
-            result += [ project.target $(p) ] ;
+            result += [ find $(pn) ] ;
         }
                         
         return $(result) ;
@@ -793,21 +791,22 @@ class file-reference : abstract-target
     
     rule generate ( properties )
     {
-         return [ property-set.empty ] 
-                [ virtual-target.from-file $(self.name)
-                                         : [ location ]
+        compute-location ;
+        return [ property-set.empty ] 
+               [ virtual-target.from-file $(self.name)
+                                         : $(self.file-location)
                                          : $(self.project) ] ;        
     }    
 
     # Returns true if the referred file really exists;
     rule exists ( )
     {
-        location ;
+        compute-location ;
         return $(self.file-path) ;
     }
 
     # Returns the location of target. Needed by 'testing.jam'
-    rule location ( )
+    rule compute-location ( )
     {
         if ! $(self.file-location)
         {