From: Ondřej Surý <ondrej@isc.org>
Date: Sun, 13 Mar 2022 16:42:09 +0000 (+0100)
Subject: Fix the remaining cases of <prog>_CFLAGS -> <prog>_CPPFLAGS
X-Git-Tag: v9.19.0~68^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41a60a0e2158bfd843b66b752e6d18b02dfea68b;p=thirdparty%2Fbind9.git

Fix the remaining cases of <prog>_CFLAGS -> <prog>_CPPFLAGS

Building BIND 9 with older version of BIND 9 installed would result in
build failure.  Fix the last two remaining cases where <prog>_CFLAGS was
being used leading to wrong order of the build flags on the command line.
---

diff --git a/bin/tools/Makefile.am b/bin/tools/Makefile.am
index 04072560dc6..d7b8e4a3317 100644
--- a/bin/tools/Makefile.am
+++ b/bin/tools/Makefile.am
@@ -47,7 +47,7 @@ if HAVE_LMDB
 bin_PROGRAMS +=			\
 	named-nzd2nzf
 
-named_nzd2nzf_CFLAGS =		\
+named_nzd2nzf_CPPFLAGS =		\
 	$(AM_CPPFLAGS)		\
 	$(LMDB_CFLAGS)
 
diff --git a/doc/misc/Makefile.am b/doc/misc/Makefile.am
index 4b88580b120..7481632e96f 100644
--- a/doc/misc/Makefile.am
+++ b/doc/misc/Makefile.am
@@ -55,8 +55,8 @@ MAINTAINERCLEANFILES = $(OPTIONS_FILES)
 
 noinst_PROGRAMS = cfg_test
 
-cfg_test_CFLAGS =			\
-	$(AM_CFLAGS)			\
+cfg_test_CPPFLAGS =			\
+	$(AM_CPPFLAGS)			\
 	$(LIBISC_CFLAGS)		\
 	$(LIBDNS_CFLAGS)		\
 	$(LIBISCCFG_CFLAGS)