diff --git a/src/server/testsuite/Makefile.am b/src/server/testsuite/Makefile.am
index f4e8378d28612142795aad88ad81a2bc321805e6..0a5578df82f5512b40fc2770f284a4a35390465f 100644
--- a/src/server/testsuite/Makefile.am
+++ b/src/server/testsuite/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.4 1998/08/06 22:00:44 ceder Exp $
+# $Id: Makefile.am,v 1.5 1998/08/07 23:29:26 ceder Exp $
 # Copyright (C) 1998  Lysator Academic Computer Association.
 #
 # This file is part of the LysKOM server.
@@ -31,6 +31,7 @@ noinst_PROGRAMS = test-l2g
 noinst_DATA = site.exp .gdbinit
 
 EXTRA_DIST = .cvsignore \
+	tcpconnect.py \
 	l2g.0/00.exp l2g.0/01.exp
 
 MOSTLYCLEANFILES = .gdbinit site.exp
@@ -39,7 +40,10 @@ test_l2g_SOURCES = test-l2g.c
 test_l2g_LDADD = ../libcheck.a $(LDADD)
 
 ../libcheck.a:
-	(cd .. && make libcheck.a)
+	(cd .. && $(MAKE) libcheck.a)
+
+../lyskomd:
+	(cd .. && $(MAKE) lyskomd)
 
 INCLUDES = -DSERVER \
 	-I$(srcdir)/.. \
@@ -77,7 +81,7 @@ check: l2g_check lyskomd_check
 l2g_check: test-l2g site.exp
 	runtest --tool l2g --srcdir $(srcdir)
 
-lyskomd_check: site.exp
+lyskomd_check: site.exp ../lyskomd
 	$(RM) -r db etc
 	mkdir db etc
 	cp $(top_srcdir)/db-crypt/db/lyskomd-data db/
@@ -87,3 +91,4 @@ lyskomd_check: site.exp
 site.exp:
 	echo "# this file is automatically generated" > site.exp
 	echo "set l2g ./test-l2g" >> site.exp
+	echo "set srcdir $(srcdir) >> site.exp