Makefile.in (env-setup.stmp): If env-setup.stamp needs to be rebuilt,

	set CONFIG_FILES so that we only regenerate that one file.

env-setup.shin: Rename SRCTOPDIR to S_TOP, which has been fixed to
	deal with absolute source paths.

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

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 249c4f03afa4e8b57a5e8e427a41eeb1daf12918..273e87ffb8b5b18582b1165d901c2c8fc8561bb4 100644 (file)
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,12 @@
+Sun Mar  1 21:13:06 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (env-setup.stmp): If env-setup.stamp needs to be
+               rebuilt, set CONFIG_FILES so that we only regenerate that
+               one file.
+
+       * env-setup.shin: Rename SRCTOPDIR to S_TOP, which has been
+               fixed to deal with absolute source paths.
+
 Sat Feb 28 18:54:42 1998  Tom Yu  <tlyu@mit.edu>
 
        * env-setup.shin (STOP): SRCTOP -> SRCTOPDIR.

diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index 172c2c9417f159986c44682431dd3732e3fbd77f..7b1cefb6aca41d8430b2c19f324637cb3b4e697f 100644 (file)
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -12,8 +12,11 @@ all:: env-setup.sh $(GEN_SCRIPTS) restore_files.sh
 # Should only rebuild env_setup.sh here (use CONFIG_FILES=), but the weird krb5
 # makefile post-processing is unconditional and would trash the makefile.
 env-setup.sh: env-setup.stamp
-env-setup.stamp: $(srcdir)/env-setup.shin $(thisconfigdir)/config.status Makefile 
-       (cd $(thisconfigdir) && $(SHELL) config.status)
+env-setup.stamp: $(srcdir)/env-setup.shin $(thisconfigdir)/config.status \
+               Makefile 
+       cd $(thisconfigdir) && \
+               CONFIG_FILES=./testing/scripts/env-setup.sh:./testing/scripts/env-setup.shin $(SHELL) \
+               config.status
        chmod +x env-setup.sh
        touch env-setup.stamp
 

diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index fb65bca6129dbd883fba38ce1b097bcb67b955d9..6e0abe80e4a71124dd8e81c57b25e8b58a10cc51 100644 (file)
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -12,7 +12,7 @@
 #
 
 TOP=@RBUILD@/kadmin
-STOP=@SRCTOPDIR@/kadmin
+STOP=@S_TOP@/kadmin
 export TOP
 export STOP