From 5e9fee215828a1a3832014f8898d8796239b63a1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 26 Sep 2013 11:58:01 -0400 Subject: [PATCH] Make EFI_PATH easily resettable from the build command line. Signed-off-by: Peter Jones --- Makefile | 4 ++-- lib/Makefile | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 134d729..868fb95 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ LIB_PATH = /usr/lib64 EFI_INCLUDE = /usr/include/efi EFI_INCLUDES = -nostdinc -ICryptlib -ICryptlib/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -EFI_PATH = /usr/lib64/gnuefi +EFI_PATH := /usr/lib64/gnuefi LIB_GCC = $(shell $(CC) -print-libgcc-file-name) EFI_LIBS = -lefi -lgnuefi --start-group Cryptlib/libcryptlib.a Cryptlib/OpenSSL/libopenssl.a --end-group $(LIB_GCC) @@ -88,7 +88,7 @@ Cryptlib/OpenSSL/libopenssl.a: $(MAKE) -C Cryptlib/OpenSSL lib/lib.a: - $(MAKE) -C lib + $(MAKE) -C lib EFI_PATH=$(EFI_PATH) %.efi: %.so objcopy -j .text -j .sdata -j .data \ diff --git a/lib/Makefile b/lib/Makefile index be5f354..4390700 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -6,7 +6,6 @@ ARCH = $(shell uname -m | sed s,i[3456789]86,ia32,) EFI_INCLUDE = /usr/include/efi EFI_INCLUDES = -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I../include -EFI_PATH = /usr/lib64/gnuefi EFI_CRT_OBJS = $(EFI_PATH)/crt0-efi-$(ARCH).o EFI_LDS = $(EFI_PATH)/elf_$(ARCH)_efi.lds