diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-02-09 17:43:52 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-02-09 17:43:52 +0000 |
| commit | 561f2cdd8613f26d7de48c567b603e8c06fe7e5a (patch) | |
| tree | 4165fe26da185697068044d1fba17cb15d5b19bc /src/kadmin/testing/scripts | |
| parent | 647d10f2b8efd96a47ce5864f685b17cc7705f9f (diff) | |
| download | krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.gz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.xz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.zip | |
Merge of libhack_branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/testing/scripts')
| -rw-r--r-- | src/kadmin/testing/scripts/ChangeLog | 9 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/env-setup.shin | 13 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index bfc97a89ea..c21053d496 100644 --- a/src/kadmin/testing/scripts/ChangeLog +++ b/src/kadmin/testing/scripts/ChangeLog @@ -1,3 +1,12 @@ +Sun Feb 9 01:07:37 1997 Tom Yu <tlyu@mit.edu> + + * env-setup.shin: Fix to deal with multiple variables in + KRB5_RUN_ENV. + +Sat Feb 8 22:12:32 1997 Tom Yu <tlyu@mit.edu> + + * env-setup.shin: Hack to deal with new usage of KRB5_RUN_ENV. + Tue Dec 3 15:28:53 1996 Barry Jaspan <bjaspan@mit.edu> * init_db: be verbose when $SRVTCL doesn't exist, instead of just diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin index ae50130095..d15c81fd98 100644 --- a/src/kadmin/testing/scripts/env-setup.shin +++ b/src/kadmin/testing/scripts/env-setup.shin @@ -18,14 +18,23 @@ export STOP # The shared library run time setup TOPLIBD=@RBUILD@/lib +PROG_LIBPATH=-L@RBUILD@/lib +# XXX kludge! +PROG_RPATH=@RBUILD@/lib # This converts $(TOPLIBD) to $TOPLIBD -foo=`echo '@KRB5_RUN_ENV@' | sed -e 's/(//' -e 's/)//'` +cat > /tmp/env_setup$$ <<\EOF +@KRB5_RUN_ENV@ +EOF + +foo=`sed -e 's/(//g' -e 's/)//g' /tmp/env_setup$$` eval $foo # This will get put in setup.csh for convenience KRB5_RUN_ENV_CSH=`eval echo "$foo" | \ - sed -e 's/\([^=]*\)=\(.*\)/setenv \1 \2/g'` + sed -e 's/\([^=]*\)=\(.*\)/setenv \1 \2/g' \ + -e 's/export [^ ;]*;//g'` export KRB5_RUN_ENV_CSH +rm /tmp/env_setup$$ TESTDIR=$TOP/testing; export TESTDIR STESTDIR=$STOP/testing; export STESTDIR |