From a5ad78f27e37b673b619afd88ae7ccf0d47261ce Mon Sep 17 00:00:00 2001 From: Geoff Lywood Date: Thu, 27 May 2010 23:00:07 +0100 Subject: [PATCH] [build] Allow building against a zlib in a non-standard location Signed-off-by: Michael Brown --- src/Makefile | 1 + src/Makefile.housekeeping | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 8247ec24..febcb4ff 100644 --- a/src/Makefile +++ b/src/Makefile @@ -46,6 +46,7 @@ ICCFIX := ./util/iccfix DOXYGEN := doxygen BINUTILS_DIR := /usr BFD_DIR := $(BINUTILS_DIR) +ZLIB_DIR := /usr ############################################################################### # diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index fbb274ff..a48dd01b 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -873,7 +873,8 @@ CLEANUP += $(ZBIN) # The EFI image converter # ELF2EFI_CFLAGS := -I$(BINUTILS_DIR)/include -I$(BFD_DIR)/include \ - -idirafter include -L$(BINUTILS_DIR)/lib -L$(BFD_DIR)/lib \ + -I$(ZLIB_DIR)/include -idirafter include \ + -L$(BINUTILS_DIR)/lib -L$(BFD_DIR)/lib -L$(ZLIB_DIR)/lib \ -lbfd -liberty -lz -Wl,--no-warn-search-mismatch $(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS)