pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / tests / dejagnu / Makefile.in

diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index d8e753001d0ffa883f96a46586a653725601dde6..85c7ab9d1e2923eaf3c359c8087e93d53f6c4233 100644 (file)
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/dejagnu
+mydir=tests$(S)dejagnu
 BUILDTOP=$(REL)..$(S)..
 RUNTEST = @RUNTEST@ $(DEJAFLAGS)
 RUNTESTFLAGS =
@@ -33,12 +33,8 @@ clean::
 clean-unix::
        $(RM) -rf tmpdir dbg.log krb.log krb.sum
 
-runenv.vars: Makefile
-       echo '$(KRB5_RUN_ENV)' | tr ';' '\012' | \
-               sed -ne 's% *\([^=]*\)=.*%\1%p' > runenv.vars
-
-runenv.vals: runenv.vars
-       $(KRB5_RUN_ENV) for i in `cat runenv.vars`; do \
+runenv.vals: Makefile
+       $(KRB5_RUN_ENV) for i in $(KRB5_RUN_VARS); do \
                eval echo "{$$i=\$$$$i}"; done > runenv.vals
 
 site.exp: runenv.vals Makefile