diff options
Diffstat (limited to 'src/kadmin/testing/scripts')
| -rw-r--r-- | src/kadmin/testing/scripts/ChangeLog | 9 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/Makefile.in | 7 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/env-setup.shin | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index 249c4f03af..273e87ffb8 100644 --- 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 172c2c9417..7b1cefb6ac 100644 --- 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 fb65bca612..6e0abe80e4 100644 --- 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 |