Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -12,14 +12,14 @@
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
 HELPERS=$(addprefix $(PREFIX)/bin/,mt_laststep mt_runstep mt_ezstep)
 
-all : megatest dboard
+all : mtest dboard
 
-megatest: $(OFILES) megatest.o
-	csc $(CSCOPTS) $(OFILES) megatest.o -o megatest
+mtest: $(OFILES) megatest.o
+	csc $(CSCOPTS) $(OFILES) megatest.o -o mtest
 
 dboard : $(OFILES) $(GOFILES)
 	csc $(OFILES) $(GOFILES) -o dboard
 
 # Special dependencies for the includes
@@ -32,13 +32,15 @@
 $(OFILES) $(GOFILES) : common_records.scm 
 
 %.o : %.scm
 	csc $(CSCOPTS) -c $<
 
-$(PREFIX)/bin/megatest : megatest
+$(PREFIX)/bin/mtest : mtest
 	@echo Installing to PREFIX=$(PREFIX)
-	$(INSTALL) megatest $(PREFIX)/bin/megatest
+	$(INSTALL) mtest $(PREFIX)/bin/mtest
+	utils/mk_wrapper $(PREFIX) mtest > $(PREFIX)/bin/megatest
+	chmod a+x $(PREFIX)/bin/megatest
 
 $(HELPERS) : utils/mt_* 
 	$(INSTALL) $< $@
 	chmod a+x $@
 
@@ -51,18 +53,18 @@
 	chmod a+x $@
 
 # install dashboard as dboard so wrapper script can be called dashboard
 $(PREFIX)/bin/dboard : dboard $(FILES)
 	$(INSTALL) dboard $(PREFIX)/bin/dboard
-	utils/mk_dashboard_wrapper $(PREFIX) > $(PREFIX)/bin/dashboard
+	utils/mk_wrapper $(PREFIX) dboard > $(PREFIX)/bin/dashboard
 	chmod a+x $(PREFIX)/bin/dashboard
 
-install : bin $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake $(PREFIX)/bin/nbfind
+install : bin $(PREFIX)/bin/mtest $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake $(PREFIX)/bin/nbfind
 
 bin : 
 	mkdir -p $(PREFIX)/bin
 
 test: tests/tests.scm
 	cd tests;csi -I .. -b -n tests.scm
 
 clean : 
 	rm -f $(OFILES) $(GOFILES) megatest dboard dboard.o megatest.o

DELETED utils/mk_dashboard_wrapper
Index: utils/mk_dashboard_wrapper
==================================================================
--- utils/mk_dashboard_wrapper
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-prefix=$1
-echo "#!/bin/bash"
-if [ "$LD_LIBRARY_PATH" != "" ];then
-  echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-fi
-
-dboard=`realpath $prefix/bin/dboard`
-
-echo "$dboard \$*"

ADDED   utils/mk_wrapper
Index: utils/mk_wrapper
==================================================================
--- /dev/null
+++ utils/mk_wrapper
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+prefix=$1
+cmd=$2
+
+echo "#!/bin/bash"
+if [ "$LD_LIBRARY_PATH" != "" ];then
+  echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+fi
+
+fullcmd=`realpath $prefix/bin/$cmd`
+
+echo "$fullcmd \$*"