@@ -49,11 +49,11 @@
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 MTMOFILES =  $(addprefix mofiles/,$(MTMSRCFILES:%.scm=%.o))
 
 mofiles/%.o : src/%.scm
 	mkdir -p mofiles
-	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
+	cd mofiles;csc $(CSCOPTS) -J -c ../src/$*.scm -o $*.o
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
 HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
 DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
 MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
@@ -69,22 +69,24 @@
 PNGFILES = $(shell cd docs/manual;ls *png)
 
 #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut
 
-mtest: $(OFILES) readline-fix.scm megatest.o $(MTMOFILES)
-	csc $(CSCOPTS) $(OFILES) $(MTMOFILES) megatest.o -o mtest
+mtest: $(OFILES) readline-fix.scm megatest.scm $(MTMOFILES) megatest-fossil-hash.scm
+	cp mofiles/ftail.import.scm .
+	csc $(CSCOPTS) $(OFILES) $(MTMOFILES) megatest.scm -o mtest
 
 
 dboard : $(OFILES) $(GOFILES) dashboard.scm $(MTMOFILES)
 	csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MTMOFILES) -o dboard
 
 ndboard : newdashboard.scm $(OFILES) $(GOFILES)
 	csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard
 
 mtut: $(OFILES) megatest-fossil-hash.scm mtut.scm $(MOFILES)
-	csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut
+	cd mofiles;csc $(CSCOPTS) -I .. $(addprefix ../,$(OFILES)) ../mtut.scm -o mtut
+	cp mofiles/mtut .
 
 TCMTOBJS = \
 	api.o \
 	archive.o \
 	cgisetup/models/pgdb.o \
@@ -140,16 +142,16 @@
 # $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm
 #	csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl
 
 # Special dependencies for the includes
 tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o  \
-archive.o megatest.o : db_records.scm
+archive.o : db_records.scm
 tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o  : run_records.scm
-db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
+db.o ezsteps.o keys.o launch.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm common.o
 tests.o tasks.o dashboard-tasks.o : task_records.scm
 runs.o : test_records.scm
-megatest.o : megatest-fossil-hash.scm
+# megatest.o : megatest-fossil-hash.scm
 rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm
 common_records.scm : altdb.scm
 vg.o dashboard.o : vg_records.scm
 dcommon.o : run_records.scm
 mofiles/db.o : mofiles/common.o