ArmPlatformPkg/Scripts/Makefile: Update after edksetup.sh changes

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15211 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/Scripts/Makefile b/ArmPlatformPkg/Scripts/Makefile
index 511aa50eacee73f1f8992adaf7fc5a74de359fa7..f933755b5193a071251280f9828a98ef1e3ff0fe 100644 (file)
--- a/ArmPlatformPkg/Scripts/Makefile
+++ b/ArmPlatformPkg/Scripts/Makefile
@@ -1,5 +1,5 @@
 #/* @file\r
-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
@@ -43,7 +43,7 @@ all: $(EDK2_CONF)
 ifeq ("$(OS)","Windows_NT")\r
        build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS)\r
 else\r
-       . ./edksetup.sh `pwd`/BaseTools; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS)\r
+       . ./edksetup.sh; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS)\r
 endif\r
 \r
 $(EDK2_CONF):\r
@@ -53,13 +53,13 @@ ifeq ("$(OS)","Windows_NT")
        copy $(EDK_TOOLS_PATH)\Conf\target.template Conf\target.txt\r
        copy $(EDK_TOOLS_PATH)\Conf\tools_def.template Conf\tools_def.txt\r
 else\r
-       . ./edksetup.sh `pwd`/BaseTools; $(MAKE) -C BaseTools\r
+       . ./edksetup.sh; $(MAKE) -C BaseTools\r
 endif\r
 \r
 clean:\r
 ifeq ("$(OS)","Windows_NT")\r
        build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall\r
 else\r
-       . ./edksetup.sh `pwd`/BaseTools; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall; \\r
+       . ./edksetup.sh; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall; \\r
        rm -Rf $(EDK2_CONF) Conf/.cache\r
 endif\r