[master] fixed out-of-tree build

3766.	[cleanup]	Fixed problems with building outside the source
			tree when using native PKCS#11. [RT #35459]

CHANGES

+3766.	[cleanup]	Fixed problems with building outside the source
+			tree when using native PKCS#11. [RT #35459]
+
 3765.	[bug]		Fixed a bug in "rndc secroots" that could crash
 			named when dumping an empty keynode. [RT #35469]
 

lib/dns/Makefile.in

@@ -13,8 +13,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.180.130.1 2012/02/11 22:37:56 each Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
@@ -34,8 +32,8 @@ top_srcdir =	@top_srcdir@
 
 USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
 
-CINCLUDES =	-I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
-		@DST_OPENSSL_INC@ @DST_GSSAPI_INC@
+CINCLUDES =	-I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
+		${ISC_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
 
 CDEFINES =	-DUSE_MD5 @CRYPTO@ @USE_GSSAPI@ ${USE_ISC_SPNEGO}
 

lib/samples/Makefile.in

@@ -12,9 +12,8 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2009/12/05 23:31:41 each Exp $
-
 srcdir =	@srcdir@
+VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
 @BIND9_VERSION@

make/rules.in

@@ -13,8 +13,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id$
-
 ###
 ### Common Makefile rules for BIND 9.
 ###
@@ -124,7 +122,7 @@ BUILD_LIBS = @BUILD_LIBS@
 .SUFFIXES:
 .SUFFIXES: .c .@O@
 
-ALWAYS_INCLUDES = -I${top_builddir}
+ALWAYS_INCLUDES = -I${top_builddir} -I${top_srcdir}
 ALWAYS_DEFINES = @ALWAYS_DEFINES@
 ALWAYS_WARNINGS =