diff --git a/boost-base.jam b/boost-base.jam
index f31fcc067..21cb01bea 100644
--- a/boost-base.jam
+++ b/boost-base.jam
@@ -1868,11 +1868,10 @@ rule stage ( name : sources + : requirements * : local-build * )
 
         local target-subdir =  [ top-relative-tokens [ directory-of $(source) ] ] ;
         local [ protect-subdir ] ;
-        SubDir TOP $(target-subdir) ;
+        SubDir $(gTOP) $(target-subdir) ;
         local target = $(source:D=:G=) ;
         local target-id = [ FGristFiles $(target) ] ;
 
-        local BUILD = ;
         local subvariants = [ expand-target-subvariants $(target-id) : $(local-build) : $(TOOLS) : BUILD ] ;
 
         dependent-include $(target) ;
diff --git a/v1/boost-base.jam b/v1/boost-base.jam
index f31fcc067..21cb01bea 100644
--- a/v1/boost-base.jam
+++ b/v1/boost-base.jam
@@ -1868,11 +1868,10 @@ rule stage ( name : sources + : requirements * : local-build * )
 
         local target-subdir =  [ top-relative-tokens [ directory-of $(source) ] ] ;
         local [ protect-subdir ] ;
-        SubDir TOP $(target-subdir) ;
+        SubDir $(gTOP) $(target-subdir) ;
         local target = $(source:D=:G=) ;
         local target-id = [ FGristFiles $(target) ] ;
 
-        local BUILD = ;
         local subvariants = [ expand-target-subvariants $(target-id) : $(local-build) : $(TOOLS) : BUILD ] ;
 
         dependent-include $(target) ;