anchor.diff:          cd config.tests\make
       )
   
  -    for /f "tokens=3" %%i in ('%QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do set MAKETYPE=%%i
  -
  -    if %MAKETYPE% == symbian-abld (
  +    for /f "tokens=3" %%i in ('%QT_PATH%qmake %SOURCE_PATH%\config.tests\make\make.pro 2^>^&1 1^>NUL') do set BUILDSYSTEM=%%i
  +
  +    if %BUILDSYSTEM% == symbian-abld (
           make -h >> %PROJECT_LOG% 2>&1
           if not errorlevel 1 (
               echo ... Symbian abld make found.
               set MAKE=make
           )
  -    ) else if %MAKETYPE% == symbian-sbsv2 (
  +    ) else if %BUILDSYSTEM% == symbian-sbsv2 (
           make -h >> %PROJECT_LOG% 2>&1
           if not errorlevel 1 (
               echo ... Symbian sbsv2 make found.
               set MAKE=make
           )
  -    ) else if %MAKETYPE% == win32-nmake (
  +    ) else if %BUILDSYSTEM% == win32-nmake (
           nmake /? >> %PROJECT_LOG% 2>&1
           if not errorlevel 1 (
               echo ... nmake found.
               set MAKE=nmake
           )
  -    ) else if %MAKETYPE% == win32-mingw (
  +    ) else if %BUILDSYSTEM% == win32-mingw (
           mingw32-make -v >> %PROJECT_LOG% 2>&1
           if not errorlevel 1 (
               echo ... mingw32-make found.
               set MAKE=mingw32-make
           )
       ) else (
  -        echo ... Unknown target environment %MAKETYPE%.
  +        echo ... Unknown target environment %BUILDSYSTEM%.
       )
       cd %CURRENT_PWD%
  -endlocal&set %1=%MAKE%&set %2=%MAKETYPE%&goto :EOF
  +endlocal&set %1=%MAKE%&set %2=%BUILDSYSTEM%&goto :EOF
   
   :checkMake
   echo Checking make
  -call :makeTest MAKE MAKETYPE
  -if not "%MAKE%" == "" goto compileTests
  +call :makeTest MOBILITY_MAKE MOBILITY_BUILDSYSTEM
  +if not "%MOBILITY_MAKE%" == "" goto compileTests
   
   echo >&2 "Cannot find 'nmake', 'mingw32-make' or 'make' in your PATH"
   echo >&2 "Aborting."
  -exit 1
  +goto errorTag
   
   :compileTest
   setlocal
  
positive.code:     else echo >&2 "Cannot find 'qmake' in %QT_PATH%."
  )
  echo >&2 "Aborting." 
  exit 1
  
  :qmakeFound
  %QT_PATH%qmake -query QT_VERSION
  
negative.code: 
  echo QT_MOBILITY_SOURCE_TREE = %SOURCE_PATH% > %QMAKE_CACHE%
  echo QT_MOBILITY_BUILD_TREE = %BUILD_PATH% >> %QMAKE_CACHE%
  set QMAKE_CACHE=
  
  :cmdline_parsing
  
  