From 651af0bf650ee8bbcad49ca3b617eb2786a563bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Sun, 13 Mar 2022 17:42:09 +0100 Subject: [PATCH] Fix the remaining cases of _CFLAGS -> _CPPFLAGS Building BIND 9 with older version of BIND 9 installed would result in build failure. Fix the last two remaining cases where _CFLAGS was being used leading to wrong order of the build flags on the command line. (cherry picked from commit 41a60a0e2158bfd843b66b752e6d18b02dfea68b) --- bin/tools/Makefile.am | 2 +- doc/misc/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/tools/Makefile.am b/bin/tools/Makefile.am index 04072560dc..d7b8e4a331 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 4b88580b12..7481632e96 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)