1 files changed, 11 insertions, 7 deletions
diff --git a/BaseTools/Makefile b/BaseTools/Makefile
index 294c532732..3736d85f5f 100644
--- a/BaseTools/Makefile
+++ b/BaseTools/Makefile
@@ -1,7 +1,7 @@
 ## @file
 # Windows makefile for Base Tools project build.
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
@@ -11,24 +11,28 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 
-SUBDIRS = Source\C Source\Python
+!IFNDEF BASE_TOOLS_PATH
+!ERROR "BASE_TOOLS_PATH is not set! Please run toolsetup.bat first!"
+!ENDIF
+
+SUBDIRS = $(BASE_TOOLS_PATH)\Source\C $(BASE_TOOLS_PATH)\Source\Python
 
 all: c python
 
 c :
-	@Source\C\Makefiles\NmakeSubdirs.bat all Source\C
+  @$(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.bat all $(BASE_TOOLS_PATH)\Source\C
 
 python:
-	@Source\C\Makefiles\NmakeSubdirs.bat all Source\Python
+  @$(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.bat all $(BASE_TOOLS_PATH)\Source\Python
 
 subdirs: $(SUBDIRS)
-	@Source\C\Makefiles\NmakeSubdirs.bat all $**
+  @$(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.bat all $**
 
 .PHONY: clean
 clean:
-	@Source\C\Makefiles\NmakeSubdirs.bat clean $(SUBDIRS)
+  @$(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.bat clean $(SUBDIRS)
 
 .PHONY: cleanall
 cleanall:
-	@Source\C\Makefiles\NmakeSubdirs.bat cleanall $(SUBDIRS)
+  @$(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.bat cleanall $(SUBDIRS)