4 files changed, 18 insertions, 18 deletions
diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe
new file mode 100644
index 0000000000..b751d1e8a9
--- /dev/null
+++ b/BaseTools/Bin/Win32/GenFw.exe
diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 1125bcf2c2..9f782076cc 100644
--- a/BaseTools/Bin/Win32/build.exe
+++ b/BaseTools/Bin/Win32/build.exe
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 3fede25e64..db459d988b 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -92,24 +92,24 @@ ToolChainFamilyMapping = {
 Makefile = {
 "nmake"	: {
 "C-Code"    : '''\
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep}
+${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
 ${END}	"$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(MODULE_DIR)${sep}${fdir}${sep}${fname}
 ''',
 
 "AutoGen-Code"    : '''\
-${BEGIN}$(OUTPUT_DIR)${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep}
+${BEGIN}$(OUTPUT_DIR)${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
 ${END}	"$(CC)" $(CC_FLAGS) $(INC) /Fo$@ $(DEBUG_DIR)${sep}${fname}
 ''',
 
 "Masm-Code" : '''\
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep}
+${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
 ${END}	"$(PP)" $(PP_FLAGS) $(INC) $(MODULE_DIR)${sep}${fdir}${sep}${fname} > $(@D)${sep}${fbase}.i
 	Trim -CONVERT $(@D)${sep}${fbase}.i
 	"$(ASM)" $(ASM_FLAGS) /Fo$@ $(@D)${sep}${fbase}.iii
 ''',
 
 "Iasm-Code" : '''\
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE_DIR)${sep}${dep}
+${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${dep}
 ${END}	"$(APP)" $(APP_FLAGS) $(INC) $< $(PP_OUTPUT)$(@D)${sep}${fbase}.i
 	"$(ASM)" $(ASM_FLAGS) $(ASM_OUTPUT)$@ $(@D)${sep}${fbase}.i
 ''',
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 3f474a04f3..9b5f45e404 100644
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -78,24 +78,24 @@ echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH%
 echo.
 
 REM
-REM copy *.template to %EDK_TOOLS_PATH%\Conf
+REM copy *.template to %WORKSPACE%\Conf
 REM
-if NOT exist %EDK_TOOLS_PATH%\Conf mkdir %EDK_TOOLS_PATH%\Conf
-if NOT exist %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.db (
-  echo copying ... FrameworkDatabase.template to %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.db
-  copy %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.db > nul
+if NOT exist %WORKSPACE%\Conf mkdir %WORKSPACE%\Conf
+if NOT exist %WORKSPACE%\Conf\FrameworkDatabase.db (
+  echo copying ... FrameworkDatabase.template to %WORKSPACE%\Conf\FrameworkDatabase.db
+  copy %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %WORKSPACE%\Conf\FrameworkDatabase.db > nul
 )
-if NOT exist %EDK_TOOLS_PATH%\Conf\target.txt (
-  echo copying ... target.template to %EDK_TOOLS_PATH%\Conf\target.txt
-  copy %EDK_TOOLS_PATH%\Conf\target.template %EDK_TOOLS_PATH%\Conf\target.txt > nul
+if NOT exist %WORKSPACE%\Conf\target.txt (
+  echo copying ... target.template to %WORKSPACE%\Conf\target.txt
+  copy %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul
 )
-if NOT exist %EDK_TOOLS_PATH%\Conf\tools_def.txt (
-  echo copying ... tools_def.template to %EDK_TOOLS_PATH%\Conf\tools_def.txt
-  copy %EDK_TOOLS_PATH%\Conf\tools_def.template %EDK_TOOLS_PATH%\Conf\tools_def.txt > nul
+if NOT exist %WORKSPACE%\Conf\tools_def.txt (
+  echo copying ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt
+  copy %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul
 )
-if NOT exist %EDK_TOOLS_PATH%\Conf\build_rule.txt (
-  echo copying ... build_rule.template to %EDK_TOOLS_PATH%\Conf\build_rule.txt
-  copy %EDK_TOOLS_PATH%\Conf\build_rule.template %EDK_TOOLS_PATH%\Conf\build_rule.txt > nul
+if NOT exist %WORKSPACE%\Conf\build_rule.txt (
+  echo copying ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt
+  copy %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul
 )
 
 REM