fix srcdir problems

Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 @BIND9_VERSION@
 
 SUBDIRS =	make lib bin

bin/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 SUBDIRS =	tests
 TARGETS =
 

bin/tests/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 CINCLUDES =	-I${srcdir}/../../lib/isc/unix/include \
 		-I${srcdir}/../../lib/isc/pthreads/include \
 		-I${srcdir}/../../lib/isc/include \

lib/Makefile.in

@@ -3,8 +3,6 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
-@SET_MAKE@
-
 SUBDIRS =	isc dns
 TARGETS =
 

lib/dns/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 @BIND9_VERSION@
 
 CINCLUDES =	-I${srcdir}/../isc/unix/include \

lib/dns/include/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 SUBDIRS =	dns
 TARGETS =
 

lib/dns/include/dns/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 @BIND9_VERSION@
 
 HEADERS =	name.h result.h types.h

lib/isc/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 @BIND9_VERSION@
 
 CINCLUDES =	-I${srcdir}/unix/include \

lib/isc/include/Makefile.in

@@ -3,8 +3,6 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
-@SET_MAKE@
-
 SUBDIRS =	isc
 TARGETS =
 

lib/isc/include/isc/Makefile.in

@@ -2,17 +2,9 @@
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
-prefix =	@prefix@
-exec_prefix =	@exec_prefix@
-includedir =	@includedir@
-
-@SET_MAKE@
 
 @BIND9_VERSION@
 
-INSTALL =	@INSTALL@
-INSTALL_DATA =	@INSTALL_DATA@
-
 HEADERS =	assertions.h boolean.h buffer.h error.h event.h heap.h \
 		list.h mem.h rbtgen.h region.h result.h rwlock.h socket.h \
 		task.h timer.h

lib/isc/pthreads/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 CINCLUDES =	-I${srcdir}/include \
 		-I${srcdir}/../unix/include \
 		-I${srcdir}/../include

lib/isc/pthreads/include/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 SUBDIRS =	isc
 TARGETS =
 

lib/isc/pthreads/include/isc/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 @BIND9_VERSION@
 
 HEADERS =	condition.h mutex.h thread.h

lib/isc/unix/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 CINCLUDES =	-I${srcdir}/include \
 		-I${srcdir}/../pthreads/include \
 		-I${srcdir}/../include

lib/isc/unix/include/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 SUBDIRS =	isc
 TARGETS =
 

lib/isc/unix/include/isc/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 @BIND9_VERSION@
 
 HEADERS =	time.h

make/Makefile.in

 
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
 SUBDIRS=
 TARGETS=
 

make/rules.in

@@ -5,10 +5,9 @@
 ###
 ### Paths
 ###
+### Note: paths that vary by Makefile MUST NOT be listed
+### here, or they won't get expanded correctly.
 
-srcdir =	@srcdir@
-VPATH =		@srcdir@
-top_srcdir =	@top_srcdir@
 prefix =	@prefix@
 exec_prefix =	@exec_prefix@
 bindir =	@bindir@