Browse Source

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

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Geoff Lywood 14 years ago
parent
commit
a5ad78f27e
2 changed files with 3 additions and 1 deletions
  1. 1
    0
      src/Makefile
  2. 2
    1
      src/Makefile.housekeeping

+ 1
- 0
src/Makefile View File

46
 DOXYGEN		:= doxygen
46
 DOXYGEN		:= doxygen
47
 BINUTILS_DIR	:= /usr
47
 BINUTILS_DIR	:= /usr
48
 BFD_DIR		:= $(BINUTILS_DIR)
48
 BFD_DIR		:= $(BINUTILS_DIR)
49
+ZLIB_DIR	:= /usr
49
 
50
 
50
 ###############################################################################
51
 ###############################################################################
51
 #
52
 #

+ 2
- 1
src/Makefile.housekeeping View File

873
 # The EFI image converter
873
 # The EFI image converter
874
 #
874
 #
875
 ELF2EFI_CFLAGS	:= -I$(BINUTILS_DIR)/include -I$(BFD_DIR)/include \
875
 ELF2EFI_CFLAGS	:= -I$(BINUTILS_DIR)/include -I$(BFD_DIR)/include \
876
-		   -idirafter include -L$(BINUTILS_DIR)/lib -L$(BFD_DIR)/lib \
876
+		   -I$(ZLIB_DIR)/include -idirafter include \
877
+		   -L$(BINUTILS_DIR)/lib -L$(BFD_DIR)/lib -L$(ZLIB_DIR)/lib \
877
 		   -lbfd -liberty -lz -Wl,--no-warn-search-mismatch
878
 		   -lbfd -liberty -lz -Wl,--no-warn-search-mismatch
878
 
879
 
879
 $(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS)
880
 $(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS)

Loading…
Cancel
Save