From: Willy Tarreau <w@1wt.eu>
Date: Wed, 21 Dec 2022 15:15:40 +0000 (+0100)
Subject: BUILD: makefile: support ZLIB_CFLAGS and ZLIB_LDFLAGS
X-Git-Tag: v2.8-dev1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d957924e688ae6dbaf9ea21fa46e676459c1181f;p=thirdparty%2Fhaproxy.git

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 0cafdad074..a1aaeef2ad 100644
--- 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),)