* pre.in: Separate KADM5 unit test files to source dir and build

		dir based on how generated.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9139 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index b18bf859895d80d771f42533306b2c6060bd09fd..6b444da699d0797c9c5cb0c15290e08d183a2e50 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  3 13:08:40 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * pre.in: Separate KADM5 unit test files to source dir and build
+               dir based on how generated.
+
 Mon Sep 23 15:40:04 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * pre.in (DEJAFLAGS): set --srcdir $(srcdir) so unit test files

diff --git a/src/config/pre.in b/src/config/pre.in
index 632480b443ae5a3d3cf52b6cf6986439985a6300..2cf5d4ed4a242a8d09ceb1662b7b8b572e79960f 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -74,14 +74,15 @@ KRB5_INCSUBDIRS = \
 # XXX check which of these are actually used!
 #
 TESTDIR                = $(BUILDTOP)/kadmin/testing
+STESTDIR       = $(SRCTOP)/kadmin/testing
 COMPARE_DUMP   = $(TESTDIR)/scripts/compare_dump.pl
 FIX_CONF_FILES = $(TESTDIR)/scripts/fixup-conf-files.pl
-INITDB         = $(TESTDIR)/scripts/init_db
+INITDB         = $(STESTDIR)/scripts/init_db
 MAKE_KEYTAB    = $(TESTDIR)/scripts/make-host-keytab.pl
 LOCAL_MAKE_KEYTAB= $(TESTDIR)/scripts/make-host-keytab.pl
-RESTORE_FILES  = $(TESTDIR)/scripts/restore_files.sh
-SAVE_FILES     = $(TESTDIR)/scripts/save_files.sh
-ENV_SETUP      = TOP=$(BUILDTOP)/kadmin $(TESTDIR)/scripts/env-setup.sh
+RESTORE_FILES  = $(STESTDIR)/scripts/restore_files.sh
+SAVE_FILES     = $(STESTDIR)/scripts/save_files.sh
+ENV_SETUP      = $(TESTDIR)/scripts/env-setup.sh
 CLNTTCL                = $(TESTDIR)/util/ovsec_kadm_clnt_tcl
 SRVTCL         = $(TESTDIR)/util/ovsec_kadm_srv_tcl
 # Dejagnu variables.
@@ -92,11 +93,11 @@ DEJAFLAGS   := $(DEJALFLAGS) $(CLFLAGS) --debug --srcdir $(srcdir) --host \
                   unknown-$(shell uname -m)-$(shell uname -s)$(shell uname -r)
 RUNTEST                = runtest $(DEJAFLAGS)
 
-START_SERVERS  = $(TESTDIR)/scripts/start_servers $(TEST_SERVER)
-START_SERVERS_LOCAL = $(TESTDIR)/scripts/start_servers_local
+START_SERVERS  = $(STESTDIR)/scripts/start_servers $(TEST_SERVER)
+START_SERVERS_LOCAL = $(STESTDIR)/scripts/start_servers_local
 
-STOP_SERVERS   = $(TESTDIR)/scripts/stop_servers $(TEST_SERVER)
-STOP_SERVERS_LOCAL = $(TESTDIR)/scripts/stop_servers_local
+STOP_SERVERS   = $(STESTDIR)/scripts/stop_servers $(TEST_SERVER)
+STOP_SERVERS_LOCAL = $(STESTDIR)/scripts/stop_servers_local
 #
 # End of macros for the KADM5 unit test system.
 #