4653. [bug] Reorder includes to move @DST_OPENSSL_INC@ and

                        @ISC_OPENSSL_INC@ after shipped include directories.
                        [RT #45581]

(cherry picked from commit 124712666e71b5f0323ffb91a89573f1bc2064fa)

diff --git a/CHANGES b/CHANGES
index eabca2bc4ce2768a0287466e294b3a0a7ee82115..a756f147ef8dd4ebe0f302d8247ed63a48f47e4f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
-4653.  [bug]           Reorder includes in bin/nsupdate/Makefile.in.
+4653.  [bug]           Reorder includes to move @DST_OPENSSL_INC@ and
+                       @ISC_OPENSSL_INC@ after shipped include directories.
                        [RT #45581]
 
        --- 9.9.11 released ---

diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 094f1377df66693a0a555099fc2685469ceb07ab..ff630c88e7912909bf36c478e70e9f9837fac125 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -25,8 +25,9 @@ VERSION=@BIND9_VERSION@
 
 READLINE_LIB = @READLINE_LIB@
 
-CINCLUDES =    -I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
-               ${ISC_INCLUDES} ${LWRES_INCLUDES} ${ISCCFG_INCLUDES}
+CINCLUDES =    -I${srcdir}/include ${DNS_INCLUDES} \
+               ${BIND9_INCLUDES} ${ISC_INCLUDES} \
+               ${LWRES_INCLUDES} ${ISCCFG_INCLUDES}
 
 CDEFINES =     -DVERSION=\"${VERSION}\"
 CWARNINGS =

diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index e5e621d4ae9789c53bae83d9fcb570d852874fb5..02fb55cf757228056916c8fa551d1e3a8efe8f4a 100644 (file)
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -18,8 +18,9 @@ top_srcdir =  @top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-               ${LWRES_INCLUDES} ${OMAPI_INCLUDES}
+CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} \
+               ${ISCCFG_INCLUDES} ${LWRES_INCLUDES} \
+               ${OMAPI_INCLUDES}
 
 CDEFINES =
 CWARNINGS =

diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index 6ffddba21efce91afb267c95ec08e21b66fe8f62..1908ffdb0c9c2cd0f5918cfdca20b9adcb3055cf 100644 (file)
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -25,7 +25,8 @@ VERSION=@BIND9_VERSION@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    -I. -I./include -I${srcdir}/include \
-               ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES}
+               ${DNS_INCLUDES} ${ISC_INCLUDES} \
+               ${ISCCFG_INCLUDES}
 
 CDEFINES =
 CWARNINGS =