diff --git a/lib/bind/Makefile.in b/lib/bind/Makefile.in
index 002bb9bcd0..54810039d4 100644
--- a/lib/bind/Makefile.in
+++ b/lib/bind/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.11 2001/07/13 02:38:26 marka Exp $
+# $Id: Makefile.in,v 1.12 2001/08/09 05:59:34 marka Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@
@@ -116,3 +116,4 @@ clean distclean::
 	rm -f libbind.@SA@ libbind.la
 distclean::
 	rm -f config.cache config.h config.log config.status libtool
+	rm -f port_before.h port_after.h
diff --git a/lib/bind/bsd/Makefile.in b/lib/bind/bsd/Makefile.in
index f2dba9f4ec..eeab93c4c3 100644
--- a/lib/bind/bsd/Makefile.in
+++ b/lib/bind/bsd/Makefile.in
@@ -13,7 +13,10 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2001/05/31 05:53:58 marka Exp $
+# $Id: Makefile.in,v 1.6 2001/08/09 05:59:36 marka Exp $
+
+srcdir=         @srcdir@
+VPATH =         @srcdir@
 
 DAEMON_OBJS=daemon.@O@
 STRSEP_OBJS=strsep.@O@
@@ -31,6 +34,6 @@ SRCS=	daemon.c ftruncate.c gettimeofday.c mktemp.c putenv.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I../include
+CINCLUDES= -I.. -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index d124af1363..e20a243433 100644
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.80 $)
+AC_REVISION($Revision: 1.81 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -1057,52 +1057,54 @@ case "$have_minimum_ifreq" in
 esac
 AC_SUBST(HAVE_MINIMUM_IFREQ)
 
-# PORT_INCLUDE
-PORT_INCLUDE=port/unknown/include
+# PORT_DIR
+PORT_DIR=port/unknown
 SOLARIS_BITTYPES="#undef NEED_SOLARIS_BITTYPES"
 BSD_COMP="#undef BSD_COMP"
 USE_FIONBIO_IOCTL="#undef USE_FIONBIO_IOCTL"
 case "$host" in
-	*aix3.2*)	PORT_INCLUDE="port/aix32/include";;
-	*aix4*)		PORT_INCLUDE="port/aix4/include";;
-	*aux3*)		PORT_INCLUDE="port/aux3/include";;
-	*-bsdi2*)	PORT_INCLUDE="port/bsdos2/include";;
-	*-bsdi*)	PORT_INCLUDE="port/bsdos/include";;
-	*-cygwin*)	PORT_INCLUDE="port/cygwin/include";;
-	*-darwin*)	PORT_INCLUDE="port/darwin/include";;
-	*-osf*)		PORT_INCLUDE="port/decunix/include";;
-	*-freebsd*)	PORT_INCLUDE="port/freebsd/include";;
-	*-hpux9*)	PORT_INCLUDE="port/hpux9/include";;
-	*-hpux10*)	PORT_INCLUDE="port/hpux10/include";;
-	*-hpux11*)	PORT_INCLUDE="port/hpux/include";;
-	*-irix*)	PORT_INCLUDE="port/irix/include";;
-	*-linux*)	PORT_INCLUDE="port/linux/include";;
-	*-lynxos*)	PORT_INCLUDE="port/lynxos/include";;
-	*-mpe*)		PORT_INCLUDE="port/mpe/include";;
-	*-netbsd*)	PORT_INCLUDE="port/netbsd/include";;
-	*-next*)	PORT_INCLUDE="port/next/include";;
-	*-openbsd*)	PORT_INCLUDE="port/openbsd/include";;
-	*-qnx*)		PORT_INCLUDE="port/qnx/include";;
-	*-rhapsody*)	PORT_INCLUDE="port/rhapsody/include";;
+	*aix3.2*)	PORT_DIR="port/aix32";;
+	*aix4*)		PORT_DIR="port/aix4";;
+	*aux3*)		PORT_DIR="port/aux3";;
+	*-bsdi2*)	PORT_DIR="port/bsdos2";;
+	*-bsdi*)	PORT_DIR="port/bsdos";;
+	*-cygwin*)	PORT_DIR="port/cygwin";;
+	*-darwin*)	PORT_DIR="port/darwin";;
+	*-osf*)		PORT_DIR="port/decunix";;
+	*-freebsd*)	PORT_DIR="port/freebsd";;
+	*-hpux9*)	PORT_DIR="port/hpux9";;
+	*-hpux10*)	PORT_DIR="port/hpux10";;
+	*-hpux11*)	PORT_DIR="port/hpux";;
+	*-irix*)	PORT_DIR="port/irix";;
+	*-linux*)	PORT_DIR="port/linux";;
+	*-lynxos*)	PORT_DIR="port/lynxos";;
+	*-mpe*)		PORT_DIR="port/mpe";;
+	*-netbsd*)	PORT_DIR="port/netbsd";;
+	*-next*)	PORT_DIR="port/next";;
+	*-openbsd*)	PORT_DIR="port/openbsd";;
+	*-qnx*)		PORT_DIR="port/qnx";;
+	*-rhapsody*)	PORT_DIR="port/rhapsody";;
 	*-solaris2.[[01234]]*)
 			BSD_COMP="#define BSD_COMP 1"
 			SOLARIS_BITTYPES="#define NEED_SOLARIS_BITTYPES 1"
 			USE_FIONBIO_IOCTL="#define USE_FIONBIO_IOCTL 1"
-			PORT_INCLUDE="port/solaris/include";;
+			PORT_DIR="port/solaris";;
 	*-solaris2.5*)
 			BSD_COMP="#define BSD_COMP 1"
 			SOLARIS_BITTYPES="#define NEED_SOLARIS_BITTYPES 1"
-			PORT_INCLUDE="port/solaris/include";;
+			PORT_DIR="port/solaris";;
 	*-solaris2*)	BSD_COMP="#define BSD_COMP 1"
-			PORT_INCLUDE="port/solaris/include";;
-	*-ultrix*)	PORT_INCLUDE="port/ultrix/include";;
-	*-sco-sysv*uw2.0*)	PORT_INCLUDE="port/unixware20/include";;
-	*-sco-sysv*uw2.1.2*)	PORT_INCLUDE="port/unixware212/include";;
-	*-sco-sysv*uw7*)	PORT_INCLUDE="port/unixware7/include";;
+			PORT_DIR="port/solaris";;
+	*-ultrix*)	PORT_DIR="port/ultrix";;
+	*-sco-sysv*uw2.0*)	PORT_DIR="port/unixware20";;
+	*-sco-sysv*uw2.1.2*)	PORT_DIR="port/unixware212";;
+	*-sco-sysv*uw7*)	PORT_DIR="port/unixware7";;
 esac
 AC_SUBST(BSD_COMP)
 AC_SUBST(SOLARIS_BITTYPES)
 AC_SUBST(USE_FIONBIO_IOCTL)
+AC_SUBST(PORT_DIR)
+PORT_INCLUDE=${PORT_DIR}/include
 AC_SUBST(PORT_INCLUDE)
 
 
@@ -2257,6 +2259,8 @@ AC_OUTPUT(
 	port_after.h
 	port_before.h
 	resolv/Makefile
+	port/Makefile
+	${PORT_DIR}/Makefile
 	${PORT_INCLUDE}/Makefile
 )
 
diff --git a/lib/bind/dst/Makefile.in b/lib/bind/dst/Makefile.in
index f5f4e3c47f..b4e0e9baf3 100644
--- a/lib/bind/dst/Makefile.in
+++ b/lib/bind/dst/Makefile.in
@@ -13,8 +13,11 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2001/05/31 05:53:59 marka Exp $
+# $Id: Makefile.in,v 1.5 2001/08/09 05:59:38 marka Exp $
  
+srcdir=		@srcdir@
+VPATH =         @srcdir@
+
 OBJS=	dst_api.@O@ hmac_link.@O@ md5_dgst.@O@ support.@O@
 
 SRCS=	dst_api.c hmac_link.c md5_dgst.c support.c
@@ -23,7 +26,7 @@ TARGETS= ${OBJS}
 
 CRYPTFLAGS=     -DCYLINK_DSS -DHMAC_MD5 -DUSE_MD5 -DDNSSAFE
 
-CINCLUDES= -I.. -I../include ${CRYPTINCL}
+CINCLUDES= -I.. -I${srcdir}/../include ${CRYPTINCL}
 CDEFINES= ${CRYPTFLAGS}
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/inet/Makefile.in b/lib/bind/inet/Makefile.in
index 8f8e16f405..8e2b6e3f5c 100644
--- a/lib/bind/inet/Makefile.in
+++ b/lib/bind/inet/Makefile.in
@@ -13,7 +13,10 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2001/05/31 05:54:02 marka Exp $
+# $Id: Makefile.in,v 1.4 2001/08/09 05:59:39 marka Exp $
+
+srcdir=		@srcdir@
+VPATH =         @srcdir@
 
 OBJS=	inet_addr.@O@ inet_cidr_ntop.@O@ inet_cidr_pton.@O@ inet_data.@O@ \
 	inet_lnaof.@O@ inet_makeaddr.@O@ inet_net_ntop.@O@ inet_net_pton.@O@ \
@@ -27,6 +30,6 @@ SRCS=	inet_addr.c inet_cidr_ntop.c inet_cidr_pton.c inet_data.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I../include
+CINCLUDES= -I.. -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/irs/Makefile.in b/lib/bind/irs/Makefile.in
index be54fdd4d5..99bd5349d5 100644
--- a/lib/bind/irs/Makefile.in
+++ b/lib/bind/irs/Makefile.in
@@ -13,7 +13,10 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2001/05/31 05:54:03 marka Exp $
+# $Id: Makefile.in,v 1.7 2001/08/09 05:59:40 marka Exp $
+
+srcdir=		@srcdir@
+VPATH =         @srcdir@
 
 WANT_IRS_THREADS_OBJS=	gethostent_r.@O@ getnetgrent_r.@O@ \
 	getprotoent_r.@O@ getservent_r.@O@
@@ -62,6 +65,6 @@ WANT_IRS_THREADSGR_OBJS=getgrent_r.@O@
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I../include
+CINCLUDES= -I.. -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/isc/Makefile.in b/lib/bind/isc/Makefile.in
index 81986578ef..137b08c2eb 100644
--- a/lib/bind/isc/Makefile.in
+++ b/lib/bind/isc/Makefile.in
@@ -13,7 +13,10 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2001/06/21 08:26:13 marka Exp $
+# $Id: Makefile.in,v 1.6 2001/08/09 05:59:41 marka Exp $
+
+srcdir=		@srcdir@
+VPATH =         @srcdir@
 
 OBJS=	assertions.@O@ base64.@O@ bitncmp.@O@ ctl_clnt.@O@ ctl_p.@O@ \
 	ctl_srvr.@O@ ev_connects.@O@ ev_files.@O@ ev_streams.@O@ \
@@ -27,6 +30,6 @@ SRCS=	assertions.c base64.c bitncmp.c ctl_clnt.c ctl_p.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I../include
+CINCLUDES= -I.. -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/nameser/Makefile.in b/lib/bind/nameser/Makefile.in
index 5840d68fdc..930078ef44 100644
--- a/lib/bind/nameser/Makefile.in
+++ b/lib/bind/nameser/Makefile.in
@@ -13,7 +13,10 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2001/05/31 05:54:05 marka Exp $
+# $Id: Makefile.in,v 1.4 2001/08/09 05:59:43 marka Exp $
+
+srcdir=		@srcdir@
+VPATH =         @srcdir@
 
 OBJS=	ns_date.@O@ ns_name.@O@ ns_netint.@O@ ns_parse.@O@ ns_print.@O@ \
 	ns_samedomain.@O@ ns_sign.@O@ ns_ttl.@O@ ns_verify.@O@
@@ -23,6 +26,6 @@ SRCS=	ns_date.c ns_name.c ns_netint.c ns_parse.c ns_print.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I../include
+CINCLUDES= -I.. -I${srcdir}/../include
 
 @BIND9_MAKE_RULES@
diff --git a/lib/bind/port/.cvsignore b/lib/bind/port/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/Makefile.in b/lib/bind/port/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/aix32/.cvsignore b/lib/bind/port/aix32/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/aix32/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/aix32/Makefile.in b/lib/bind/port/aix32/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/aix32/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/aix4/.cvsignore b/lib/bind/port/aix4/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/aix4/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/aix4/Makefile.in b/lib/bind/port/aix4/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/aix4/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/aux3/.cvsignore b/lib/bind/port/aux3/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/aux3/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/aux3/Makefile.in b/lib/bind/port/aux3/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/aux3/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/bsdos/.cvsignore b/lib/bind/port/bsdos/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/bsdos/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/bsdos/Makefile.in b/lib/bind/port/bsdos/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/bsdos/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/bsdos2/.cvsignore b/lib/bind/port/bsdos2/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/bsdos2/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/bsdos2/Makefile.in b/lib/bind/port/bsdos2/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/bsdos2/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/darwin/.cvsignore b/lib/bind/port/darwin/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/darwin/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/darwin/Makefile.in b/lib/bind/port/darwin/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/darwin/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/decunix/.cvsignore b/lib/bind/port/decunix/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/decunix/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/decunix/Makefile.in b/lib/bind/port/decunix/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/decunix/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/freebsd/.cvsignore b/lib/bind/port/freebsd/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/freebsd/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/freebsd/Makefile.in b/lib/bind/port/freebsd/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/freebsd/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/hpux/.cvsignore b/lib/bind/port/hpux/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/hpux/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/hpux/Makefile.in b/lib/bind/port/hpux/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/hpux/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/hpux10/.cvsignore b/lib/bind/port/hpux10/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/hpux10/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/hpux10/Makefile.in b/lib/bind/port/hpux10/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/hpux10/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/hpux9/.cvsignore b/lib/bind/port/hpux9/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/hpux9/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/hpux9/Makefile.in b/lib/bind/port/hpux9/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/hpux9/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/irix/.cvsignore b/lib/bind/port/irix/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/irix/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/irix/Makefile.in b/lib/bind/port/irix/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/irix/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/linux/.cvsignore b/lib/bind/port/linux/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/linux/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/linux/Makefile.in b/lib/bind/port/linux/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/linux/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/lynxos/.cvsignore b/lib/bind/port/lynxos/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/lynxos/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/lynxos/Makefile.in b/lib/bind/port/lynxos/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/lynxos/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/mpe/.cvsignore b/lib/bind/port/mpe/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/mpe/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/mpe/Makefile.in b/lib/bind/port/mpe/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/mpe/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/netbsd/.cvsignore b/lib/bind/port/netbsd/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/netbsd/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/netbsd/Makefile.in b/lib/bind/port/netbsd/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/netbsd/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/next/.cvsignore b/lib/bind/port/next/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/next/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/next/Makefile.in b/lib/bind/port/next/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/next/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/openbsd/.cvsignore b/lib/bind/port/openbsd/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/openbsd/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/openbsd/Makefile.in b/lib/bind/port/openbsd/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/openbsd/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/prand_conf/.cvsignore b/lib/bind/port/prand_conf/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/prand_conf/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/prand_conf/Makefile.in b/lib/bind/port/prand_conf/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/prand_conf/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/qnx/.cvsignore b/lib/bind/port/qnx/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/qnx/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/qnx/Makefile.in b/lib/bind/port/qnx/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/qnx/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/rhapsody/.cvsignore b/lib/bind/port/rhapsody/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/rhapsody/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/rhapsody/Makefile.in b/lib/bind/port/rhapsody/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/rhapsody/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/sco42/.cvsignore b/lib/bind/port/sco42/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/sco42/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/sco42/Makefile.in b/lib/bind/port/sco42/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/sco42/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/sco50/.cvsignore b/lib/bind/port/sco50/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/sco50/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/sco50/Makefile.in b/lib/bind/port/sco50/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/sco50/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/solaris/.cvsignore b/lib/bind/port/solaris/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/solaris/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/solaris/Makefile.in b/lib/bind/port/solaris/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/solaris/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/sunos/.cvsignore b/lib/bind/port/sunos/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/sunos/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/sunos/Makefile.in b/lib/bind/port/sunos/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/sunos/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/ultrix/.cvsignore b/lib/bind/port/ultrix/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/ultrix/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/ultrix/Makefile.in b/lib/bind/port/ultrix/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/ultrix/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/unixware20/.cvsignore b/lib/bind/port/unixware20/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/unixware20/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/unixware20/Makefile.in b/lib/bind/port/unixware20/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/unixware20/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/unixware212/.cvsignore b/lib/bind/port/unixware212/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/unixware212/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/unixware212/Makefile.in b/lib/bind/port/unixware212/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/unixware212/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/unixware7/.cvsignore b/lib/bind/port/unixware7/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/unixware7/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/unixware7/Makefile.in b/lib/bind/port/unixware7/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/unixware7/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/port/unknown/.cvsignore b/lib/bind/port/unknown/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/unknown/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/unknown/Makefile.in b/lib/bind/port/unknown/Makefile.in
new file mode 100644
index 0000000000..bd17173368
--- /dev/null
+++ b/lib/bind/port/unknown/Makefile.in
@@ -0,0 +1 @@
+# Copyright (C) 2001  Internet Software Consortium.
diff --git a/lib/bind/resolv/Makefile.in b/lib/bind/resolv/Makefile.in
index d5b592d09e..056092b8ad 100644
--- a/lib/bind/resolv/Makefile.in
+++ b/lib/bind/resolv/Makefile.in
@@ -13,7 +13,10 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2001/05/31 05:54:07 marka Exp $
+# $Id: Makefile.in,v 1.3 2001/08/09 05:59:45 marka Exp $
+
+srcdir=		@srcdir@
+VPATH =         @srcdir@
 
 OBJS=	herror.@O@ res_comp.@O@ res_data.@O@ res_debug.@O@ \
 	res_findzonecut.@O@ res_init.@O@ res_mkquery.@O@ res_mkupdate.@O@ \
@@ -25,7 +28,7 @@ SRCS=	herror.c res_comp.c res_data.c res_debug.c \
 
 TARGETS= ${OBJS}
 
-CINCLUDES= -I.. -I../include
+CINCLUDES= -I.. -I${srcdir}/../include
 CWARNINGS=
 
 @BIND9_MAKE_RULES@