BUILD: makefile: support ZLIB_CFLAGS and ZLIB_LDFLAGS

The CFLAGS and LDFLAGS appended by USE_ZLIB can now be overridden using
ZLIB_CFLAGS and ZLIB_LDFLAGS.

diff --git a/Makefile b/Makefile
index 0cafdad074f5edf9f8283e550e0ef57c3a2034e7..a1aaeef2ad429a6dfdbb68fc4e838ecc7c63c567 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -519,8 +519,8 @@ endif
 
 ifneq ($(USE_ZLIB),)
   # Use ZLIB_INC and ZLIB_LIB to force path to zlib.h and libz.{a,so} if needed.
-  OPTIONS_CFLAGS  += $(if $(ZLIB_INC),-I$(ZLIB_INC))
-  OPTIONS_LDFLAGS += $(if $(ZLIB_LIB),-L$(ZLIB_LIB)) -lz
+  ZLIB_CFLAGS      = $(if $(ZLIB_INC),-I$(ZLIB_INC))
+  ZLIB_LDFLAGS     = $(if $(ZLIB_LIB),-L$(ZLIB_LIB)) -lz
 endif
 
 ifneq ($(USE_SLZ),)