From 5647da05dc5997bf218e0214ab94fb56b84d8ca1 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Mon, 10 Apr 2006 11:26:04 +0000
Subject: [PATCH] Make it possible to specify rule name with '@' prefix to the
 'make' rule, just like for 'notfile' rule. Using rule name without '@' still
 works for backward compatibility.

[SVN r33632]
---
 v2/tools/make.jam | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/v2/tools/make.jam b/v2/tools/make.jam
index 0caee31df..bd00ae92e 100644
--- a/v2/tools/make.jam
+++ b/v2/tools/make.jam
@@ -47,7 +47,12 @@ rule make ( target-name : sources * : generating-rule + : requirements * )
     
     # The '@' sign causes the feature.jam module to qualify rule name
     # with the module name of current project, if needed.
-    requirements += <action>@$(generating-rule) ;
+    local m = [ MATCH ^(@).* : $(generating-rule) ] ;
+    if ! $(m)
+    {
+        generating-rule = @$(generating-rule) ;
+    }        
+    requirements += <action>$(generating-rule) ;
     
     targets.main-target-alternative
      [ new make-target-class $(target-name) : $(project)