*** a/tools/build/v2/build/project.jam	2010-02-17 04:49:08.000000000 -0500
--- b/tools/build/v2/build/project.jam	2010-08-18 19:29:58.000000000 -0400
***************
*** 294,311 ****
            :  "Filenames are: " $(jamfile-to-load:D=) ;
      }
      
-     # Initialize the Jamfile module before loading.
-     #
-     initialize $(jamfile-module) : [ path.parent $(jamfile-to-load) ]
-         : $(jamfile-to-load:BS) ;
- 
-     local saved-project = $(.current-project) ;
      # Now load the Jamfile in it's own context. Initialization might have loaded
      # parent Jamfiles, which might have loaded the current Jamfile with
      # use-project. Do a final check to make sure it's not loaded already.
      if ! $(jamfile-module) in $(.jamfile-modules)
      {
          .jamfile-modules += $(jamfile-module) ;
          mark-as-user $(jamfile-module) ;
          modules.load $(jamfile-module) : [ path.native $(jamfile-to-load) ] : . ;
          if [ MATCH ($(JAMROOT)) : $(jamfile-to-load:BS) ]
--- 294,313 ----
            :  "Filenames are: " $(jamfile-to-load:D=) ;
      }
      
      # Now load the Jamfile in it's own context. Initialization might have loaded
      # parent Jamfiles, which might have loaded the current Jamfile with
      # use-project. Do a final check to make sure it's not loaded already.
      if ! $(jamfile-module) in $(.jamfile-modules)
      {
          .jamfile-modules += $(jamfile-module) ;
+ 
+         # Initialize the Jamfile module before loading.
+         #
+         initialize $(jamfile-module) : [ path.parent $(jamfile-to-load) ]
+             : $(jamfile-to-load:BS) ;
+ 
+         local saved-project = $(.current-project) ;
+ 
          mark-as-user $(jamfile-module) ;
          modules.load $(jamfile-module) : [ path.native $(jamfile-to-load) ] : . ;
          if [ MATCH ($(JAMROOT)) : $(jamfile-to-load:BS) ]
***************
*** 316,322 ****
                  load-aux $(jamfile-module) : [ path.native $(jamfile) ] ;
              }
          }
!     }
      # Now do some checks.
      if $(.current-project) != $(saved-project)
      {
--- 318,324 ----
                  load-aux $(jamfile-module) : [ path.native $(jamfile) ] ;
              }
          }
! 
      # Now do some checks.
      if $(.current-project) != $(saved-project)
      {
***************
*** 346,351 ****
--- 348,354 ----
              }
          }
      }
+     }
  }