@@ -33,11 +33,11 @@
 
 # module source files
 MSRCFILES = ftail.scm portlogger.scm nmsg-transport.scm
 
 # files needed for mtserve
-MTSERVEFILES = common.scm megatest-version.scm margs.scm
+MTSERVEFILES = common.scm megatest-version.scm margs.scm server.scm db.scm keys.scm ods.scm
 
 # Eggs to install (straightforward ones)
 EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \
 dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \
 json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \
@@ -72,11 +72,10 @@
 ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
 # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
 PNGFILES = $(shell cd docs/manual;ls *png)
 
-#all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut mtserve
 
 mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES)
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o mtest
 
@@ -194,10 +193,14 @@
 $(PREFIX)/bin/.$(ARCHSTR)/mtserve : mtserve utils/mk_wrapper
 	@echo Installing to PREFIX=$(PREFIX)
 	$(INSTALL) mtserve $(PREFIX)/bin/.$(ARCHSTR)/mtserve
 	utils/mk_wrapper $(PREFIX) mtserve $(PREFIX)/bin/mtserver
 	chmod a+x $(PREFIX)/bin/mtserver
+
+$(PREFIX)/bin/mtserver : $(PREFIX)/bin/.$(ARCHSTR)/mtserve utils/mk_wrapper
+	utils/mk_wrapper $(PREFIX) mtserve $(PREFIX)/bin/mtserver
+	chmod a+x $(PREFIX)/bin/mtserver
 
 $(PREFIX)/bin/.$(ARCHSTR)/ndboard : ndboard
 	$(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard
 
 $(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper
@@ -299,11 +302,11 @@
 	chmod a+x $(PREFIX)/bin/dashboard
 	$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
 
 install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \
           $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
-          $(PREFIX)/bin/serialize-env \
+          $(PREFIX)/bin/serialize-env $(PREFIX)/bin/mtserver \
 	  $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \
 	  $(PREFIX)/bin/tcmt $(PREFIX)/share/db/mt-pg.sql \
           $(PREFIX)/share/js/jquery-3.1.0.slim.min.js