--- netat/Makefile.m4.orig	Thu Nov 14 14:23:47 1996
+++ netat/Makefile.m4	Thu Nov 14 14:24:05 1996
@@ -1,4 +1,4 @@
-I=includedir()
+I=includedest()
 HFILES = aberrors.h abqueue.h appletalk.h afp.h afpcmd.h afpc.h \
 	 compat.h sysvcompat.h macfile.h abnbp.h fcntldomv.h afppass.h
 
--- etc/Makefile.m4.orig	Sun Mar  8 22:46:19 1992
+++ etc/Makefile.m4	Sun Jan 26 00:19:02 1997
@@ -1,17 +1,20 @@
 CFLAGS=cflags() nbpflags() specialcflags()
 SDESTDIR=capsrvrdestdir()
 UDESTDIR=capdestdir()
-ETCDIR=etcdest()
 CAPLIB=libcap()
 I=includedir()
 # for other libraries (like BSD on hpux)
 SLIB=libspecial()
 
+ETCDIR=/var/run
+
 ifdef([useatis],[],[# ])ATISPROGS=atis
 PROGS=${ATISPROGS} 
 
 # aufs.c definitions: USEVPRINTF - use vprintf in logging
 ifdef([usevprintf],[],[#])ATISDEFS=-DUSEVPRINTF
+
+ATISDEFS+=-DNISDUMPFILE=\"/var/tmp/nis.db\" -DATISRUNFILE=\"/var/tmp/atis.run\"
 
 # Make sure to define needgetopt if your system doesnt have it or
 # just set GETOPT=att_getopt.o (or to a getopt of your own liking)
--- support/uab/Makefile.m4.orig	Sun Mar  8 22:46:21 1992
+++ support/uab/Makefile.m4	Sun Jan 26 00:46:55 1997
@@ -5,6 +5,8 @@
 CAPLIB=libcap()
 LFLAGS=
 
+UABDEFS=-DUAB_RUNFILE=\"/var/tmp/uab.run\" -DUAB_STATSFILE=\"/var/tmp/uab.stats\" -DUAB_DUMPFILE=\"/var/tmp/uab.dump\"
+
 SRCS=aarp.c kip_mpx.c rtmp.c ethertalk.c ddprouter.c ddpsvcs.c ddpport.c \
 	hash.c asyncatalk.c
 OBJS=aarp.o kip_mpx.o rtmp.o ethertalk.o ddprouter.o ddpsvcs.o ddpport.o \
@@ -28,7 +30,7 @@
 	${CC} -c ${CFLAGS} -DTAB=etalklocal() -DMTAB=etalklocal() kip_mpx.c
 
 uab.o: uab.c mpxddp.h gw.h node.h ddpport.h if_desc.h
-	${CC} -c ${CFLAGS} -DUAB_PIDFILE=uabpidfile() \
+	${CC} -c ${CFLAGS} ${UABDEFS} -DUAB_PIDFILE=uabpidfile() \
 			-DBRIDGE_DESC=uabbrdescr() uab.c
 
 lint: