From 3f3659e2f70055c073566910149eb08019ceb6c2 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Wed, 5 Feb 2014 12:55:27 +0000 Subject: [PATCH] ArmPlatformPkg/Scripts/Makefile: Update after edksetup.sh changes Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15211 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/Scripts/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ArmPlatformPkg/Scripts/Makefile b/ArmPlatformPkg/Scripts/Makefile index 511aa50eac..f933755b51 100644 --- a/ArmPlatformPkg/Scripts/Makefile +++ b/ArmPlatformPkg/Scripts/Makefile @@ -1,5 +1,5 @@ #/* @file -# Copyright (c) 2011-2012, ARM Limited. All rights reserved. +# Copyright (c) 2011-2014, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -43,7 +43,7 @@ all: $(EDK2_CONF) ifeq ("$(OS)","Windows_NT") build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) else - . ./edksetup.sh `pwd`/BaseTools; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) + . ./edksetup.sh; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) endif $(EDK2_CONF): @@ -53,13 +53,13 @@ ifeq ("$(OS)","Windows_NT") copy $(EDK_TOOLS_PATH)\Conf\target.template Conf\target.txt copy $(EDK_TOOLS_PATH)\Conf\tools_def.template Conf\tools_def.txt else - . ./edksetup.sh `pwd`/BaseTools; $(MAKE) -C BaseTools + . ./edksetup.sh; $(MAKE) -C BaseTools endif clean: ifeq ("$(OS)","Windows_NT") build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall else - . ./edksetup.sh `pwd`/BaseTools; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall; \ + . ./edksetup.sh; build -a $(EDK2_ARCH) -p $(EDK2_DSC) -t $(EDK2_TOOLCHAIN) -b $(EDK2_BUILD) $(EDK2_MACROS) cleanall; \ rm -Rf $(EDK2_CONF) Conf/.cache endif -- 2.39.2