From 561f2cdd8613f26d7de48c567b603e8c06fe7e5a Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Sun, 9 Feb 1997 17:43:52 +0000
Subject: Merge of libhack_branch

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kadmin/testing/scripts/env-setup.shin | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/kadmin/testing/scripts/env-setup.shin')

diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index ae5013009..d15c81fd9 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
-- 
cgit