8 files changed, 26 insertions, 3 deletions
diff --git a/src/kadmin/testing/ChangeLog b/src/kadmin/testing/ChangeLog
new file mode 100644
index 000000000..40303f899
--- /dev/null
+++ b/src/kadmin/testing/ChangeLog
@@ -0,0 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and
+		remove use of DO_SUBDIRS.
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in
index 0b9d609fc..ae1002d4b 100644
--- a/src/kadmin/testing/Makefile.in
+++ b/src/kadmin/testing/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS)
 
 all::
diff --git a/src/kadmin/testing/configure.in b/src/kadmin/testing/configure.in
index d157c12be..60dd52a5a 100644
--- a/src/kadmin/testing/configure.in
+++ b/src/kadmin/testing/configure.in
@@ -1,5 +1,4 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-CONFIG_DIRS(scripts util)
-DO_SUBDIRS
+AC_CONFIG_SUBDIRS(scripts util)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index c21053d49..9133a4a5c 100644
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Sun Feb  9 01:07:37 1997  Tom Yu  <tlyu@mit.edu>
 
 	* env-setup.shin: Fix to deal with multiple variables in
diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index 65e646d7b..fda52fe6e 100644
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 PERL=@PERL@
 
 .SUFFIXES: .plin .pl
diff --git a/src/kadmin/testing/scripts/configure.in b/src/kadmin/testing/scripts/configure.in
index 84277a42d..eda5f77df 100644
--- a/src/kadmin/testing/scripts/configure.in
+++ b/src/kadmin/testing/scripts/configure.in
@@ -7,4 +7,7 @@ RBUILD=`pwd`/../../..
 AC_SUBST(RBUILD)
 dnl The following are substituted into env-setup.sh
 AC_SUBST(SRCTOP)
-V5_AC_OUTPUT_MAKEFILE( ,env-setup.sh:env-setup.shin)
+K5_GEN_MAKEFILE(.)
+K5_GEN_FILE(env-setup.sh:env-setup.shin)
+K5_OUTPUT_FILES
+
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index c5d3d4cc5..48b5e6369 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Wed Oct 22 15:40:34 1997  Ezra Peisach  <epeisach@dumpster.rose.brandeis.edu>
 
 	* test.c, tcl_ovsec_kadm.c, tcl_krb5_hash.c, tcl_kadm5.c: Include
diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index 6c6cf630b..233fd8b6d 100644
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCL_INCLUDES)
 
 PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)