STABLE12-update-tests-for-stable-20020128

no objdir support in 1.2 yet

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index b3d9f07189024448605c7e9fa125b7a58e7dbc35..452adf138a32097ba4512562567a72fe987028c7 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,12 +1,18 @@
+SYS_NAME=@AFS_SYSNAME@
+MKAFS_OSTYPE=@MKAFS_OSTYPE@
+TOP_SRCDIR=@TOP_SRCDIR@
+TOP_INCDIR=@TOP_INCDIR@
+TOP_LIBDIR=@TOP_LIBDIR@
+COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 srcdir         = @srcdir@
-include @TOP_OBJDIR@/src/config/Makefile.config
+include ../config/Makefile.${SYS_NAME}
 
 SHELL          = /bin/sh
 
-CFLAGS         = -I. -I${srcdir} ${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS         = -I. -I${srcdir} ${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
 LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS}
 
-INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR}
+INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR}
 INCLIBS=-L${SRCDIR}/lib/afs -L${TOP_LIBDIR}
 
 LIBS=\
@@ -336,7 +342,7 @@ mmap-cat: mmap-cat.o $(EXTRA_OBJS)
        $(CC) $(LDFLAGS) -o $@ mmap-cat.o $(EXTRA_OBJS) $(LIBS)
 
 run-tests: run-tests.in
-       (cd ../..; CONFIG_FILES=src/tests/run-tests CONFIG_HEADERS= $(SHELL) @TOP_OBJDIR@/config.status)
+       (cd ../..; CONFIG_FILES=src/tests/run-tests CONFIG_HEADERS= $(SHELL) @TOP_SRCDIR@/../config.status)
        @chmod +x run-tests
 
 #.c.o: