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 b93a9393966967b9cec7a782341fe00e4db6d332..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 =
@@ -8,9 +8,11 @@ PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS=$(srcdir)/t_inetd.c
 
-all install::
+all:: t_inetd
 
-check:: check-runtest-@HAVE_RUNTEST@ ./pkinit-certs
+install::
+
+check:: check-runtest-@HAVE_RUNTEST@
 
 check-runtest-no::
        @echo "+++"
@@ -25,23 +27,14 @@ check-runtest-yes:: t_inetd site.exp
 t_inetd:: t_inetd.o $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o t_inetd t_inetd.o $(KRB5_BASE_LIBS)
 
-# symlink pkinit certificate directory to avoid relative vs absolute srcdir
-./pkinit-certs:
-       $(LN) -s $srcdir/pkinit-certss pkinit-certs
-
 clean::
        $(RM) t_inetd t_inetd.o site.exp runenv.vars runenv.vals
-       -test -l pkinit-certs && $(RM) pkinit-certs
 
 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