[gPXE git] mainline commit to master: [build] Allow building against a zlib in a non-standard location

[git at etherboot.org]

In the Main gPXE repository, branch master has been updated.
      adds  0e6bcf5 [build] Allow building against a zlib in a non-standard location
      from  719c4e4 [efi] Fix *.efi linking

Summary of changes:
 src/Makefile              |    1 +
 src/Makefile.housekeeping |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
------
commit 0e6bcf52bfcae04fe6011771efab9cf3d004335a
Author: Geoff Lywood <glywood at vmware.com>
Date: Thu May 27 14:27:20 2010 -0700
Committer: Joshua Oreman <oremanj at rwcr.net>

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

Support a ZLIB_DIR= variable on the make command line.

Signed-off-by: Joshua Oreman <oremanj at rwcr.net>

diff --git a/src/Makefile b/src/Makefile
index c02acb9..7e826e7 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 40bd878..bf16fde 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -895,8 +895,9 @@ 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 \
-		   -lbfd -liberty -lz
+		   -I$(ZLIB_DIR)/include -idirafter include \
+		   -L$(BINUTILS_DIR)/lib -L$(BFD_DIR)/lib \
+		   -L$(ZLIB_DIR)/lib -lbfd -liberty -lz
 
 $(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS)
 	$(QM)$(ECHO) "  [HOSTCC] $@"
-----------------------------------------------------------------------


-- 
Main gPXE repository