diff options
| author | Geoff Lywood <glywood@vmware.com> | 2010-05-27 23:00:07 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2010-05-27 23:00:07 +0100 |
| commit | a5ad78f27e37b673b619afd88ae7ccf0d47261ce (patch) | |
| tree | 44a8fe412943c39a2f348ff4788637eb9c2b1d3b /src | |
| parent | c68839d4d69742ac21c430aca8a9a4de81dd6ca5 (diff) | |
| download | ipxe-a5ad78f27e37b673b619afd88ae7ccf0d47261ce.zip ipxe-a5ad78f27e37b673b619afd88ae7ccf0d47261ce.tar.gz ipxe-a5ad78f27e37b673b619afd88ae7ccf0d47261ce.tar.bz2 | |
[build] Allow building against a zlib in a non-standard location
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/Makefile.housekeeping | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 8247ec2..febcb4f 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 fbb274f..a48dd01 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) |