Problems building mixed Delphi 2007 / 2009 project

[tgr]

I have a project including both Delphi 2007 and Delphi 2009 steps.

The Delphi 2009 step builds fine.

The problem is the Delphi 2007 step -- MsBuild reports 2 errors. After some experimenting, I found that the command line created by Visual Build Pro refers to the wrong folder for rsvars.bat:

cmd /c "@echo off&"C:\Program Files (x86)\CodeGear\RAD Studio\6.0\Bin\rsvars.bat"&C:\Windows\Microsoft.NE T\Framework\v2.0.50727\MSBuild.exe C:\Temp\Project1.dproj /p:Configuration=Release||exit -1"

The correct statement should be:
cmd /c "@echo off&"C:\Program Files (x86)\CodeGear\RAD Studio\5.0\Bin\rsvars.bat"&C:\Windows\Microsoft.NE T\Framework\v2.0.50727\MSBuild.exe C:\Temp\Project1.dproj /p:Configuration=Release||exit -1"

Is there a way to force Visual Build Pro to use the correct rsvars.bat?

Thanks, Trond