[build] Allow building against a zlib in a non-standard location

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/Makefile b/src/Makefile
index 8247ec24cb49c525ecbd75ee06d0f597563633d1..febcb4ff79a90f14e389d79af3dba66abb0ad1d5 100644 (file)
--- 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 fbb274fff25d8ba8e297c01b41057781a5899e36..a48dd01b50e630fc9b5a87c20d10596eae550f5b 100644 (file)
--- 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)