From: Geoff Lywood <glywood@vmware.com>
Date: Thu, 27 May 2010 22:00:07 +0000 (+0100)
Subject: [build] Allow building against a zlib in a non-standard location
X-Git-Tag: v1.20.1~2672
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5ad78f27e37b673b619afd88ae7ccf0d47261ce;p=thirdparty%2Fipxe.git

[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 8247ec24c..febcb4ff7 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 fbb274fff..a48dd01b5 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)