Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -213,53 +213,53 @@
 	csc $(CSCOPTS) -c common.scm mofiles/commonmod.o
 
 configf.o : configf.scm mofiles/commonmod.o
 	csc $(CSCOPTS) -c configf.scm mofiles/commonmod.o
 
-$(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper
+$(PREFIX)/bin/.$(ARCHSTR)/bin/mtest : mtest utils/mk_wrapper
 	@echo Installing to PREFIX=$(PREFIX)
-	$(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest
+	$(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/bin/mtest
 	utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest
 	chmod a+x $(PREFIX)/bin/megatest
 
-$(PREFIX)/bin/.$(ARCHSTR)/ndboard : ndboard
-	$(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard
+$(PREFIX)/bin/.$(ARCHSTR)/bin/ndboard : ndboard
+	$(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/bin/ndboard
 
 $(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper
 	utils/mk_wrapper $(PREFIX) ndboard $(PREFIX)/bin/newdashboard
 	chmod a+x $(PREFIX)/bin/newdashboard
 
 # mtutil
 
-$(PREFIX)/bin/.$(ARCHSTR)/mtut : mtut
-	$(INSTALL) mtut $(PREFIX)/bin/.$(ARCHSTR)/mtut
+$(PREFIX)/bin/.$(ARCHSTR)/bin/mtut : mtut
+	$(INSTALL) mtut $(PREFIX)/bin/.$(ARCHSTR)/bin/mtut
 
 install-mtut : mtut
 	$(INSTALL) mtut $(PREFIX)/bin/mtut
 
-$(PREFIX)/bin/mtutil : $(PREFIX)/bin/.$(ARCHSTR)/mtut utils/mk_wrapper
+$(PREFIX)/bin/mtutil : $(PREFIX)/bin/.$(ARCHSTR)/bin/mtut utils/mk_wrapper
 	utils/mk_wrapper $(PREFIX) mtut $(PREFIX)/bin/mtutil
 	chmod a+x $(PREFIX)/bin/mtutil
 
 # mtexec
 
 mtexec: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtexec.scm
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) mtexec.scm -o mtexec
 
-$(PREFIX)/bin/.$(ARCHSTR)/mtexec : mtexec
-	$(INSTALL) mtexec $(PREFIX)/bin/.$(ARCHSTR)/mtexec
+$(PREFIX)/bin/.$(ARCHSTR)/bin/mtexec : mtexec
+	$(INSTALL) mtexec $(PREFIX)/bin/.$(ARCHSTR)/bin/mtexec
 
-$(PREFIX)/bin/mtexec : $(PREFIX)/bin/.$(ARCHSTR)/mtexec utils/mk_wrapper
+$(PREFIX)/bin/mtexec : $(PREFIX)/bin/.$(ARCHSTR)/bin/mtexec utils/mk_wrapper
 	utils/mk_wrapper $(PREFIX) mtexec $(PREFIX)/bin/mtexec
 	chmod a+x $(PREFIX)/bin/mtexec
 
 # tcmt
 
-$(PREFIX)/bin/.$(ARCHSTR)/tcmt : tcmt
-	$(INSTALL) tcmt $(PREFIX)/bin/.$(ARCHSTR)/tcmt
+$(PREFIX)/bin/.$(ARCHSTR)/bin/tcmt : tcmt
+	$(INSTALL) tcmt $(PREFIX)/bin/.$(ARCHSTR)/bin/tcmt
 
-$(PREFIX)/bin/tcmt : $(PREFIX)/bin/.$(ARCHSTR)/tcmt utils/mk_wrapper
+$(PREFIX)/bin/tcmt : $(PREFIX)/bin/.$(ARCHSTR)/bin/tcmt utils/mk_wrapper
 	utils/mk_wrapper $(PREFIX) tcmt $(PREFIX)/bin/tcmt
 	chmod a+x $(PREFIX)/bin/tcmt
 
 $(PREFIX)/bin/mt_laststep : utils/mt_laststep
 	$(INSTALL) $< $@
@@ -317,26 +317,27 @@
 	make -C helpers $@ PREFIX=$(PREFIX) INSTALL=$(INSTALL) ARCHSTR=$(ARCHSTR)
 
 mtest-reaper: $(PREFIX)/bin/mtest-reaper
 
 # install dashboard as dboard so wrapper script can be called dashboard
-$(PREFIX)/bin/.$(ARCHSTR)/dboard : dboard $(FILES) utils/mk_wrapper
+$(PREFIX)/bin/.$(ARCHSTR)/bin/dboard : dboard $(FILES) utils/mk_wrapper
 	utils/mk_wrapper $(PREFIX) dboard $(PREFIX)/bin/dashboard
 	chmod a+x $(PREFIX)/bin/dashboard
-	$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
+	$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/bin/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/.$(ARCHSTR)/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \
+install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/bin/mtest $(PREFIX)/bin/megatest \
+          $(PREFIX)/bin/.$(ARCHSTR)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
+          $(PREFIX)/bin/.$(ARCHSTR)/bin/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \
 	  $(PREFIX)/bin/nbfind $(PREFIX)/bin/mtrunner $(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 
 
 $(PREFIX)/bin/.$(ARCHSTR) : 
 	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)
+	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/bin
 	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib
 
 test: tests/tests.scm
 	cd tests;csi -I .. -b -n tests.scm
 
@@ -449,10 +450,15 @@
 
 #======================================================================
 # Chicken build
 #======================================================================
 
+tgz-$(USER)/postgresql-9.6.4.tar.gz :
+	mkdir -p tgz-$(USER)
+	wget -c https://ftp.postgresql.org/pub/source/v9.6.4/postgresql-9.6.4.tar.gz
+	mv postgresql-9.6.4.tar.gz tgz-$(USER)/
+
 tgz-$(USER)/sqlite-autoconf-3090200.tar.gz :
 	mkdir -p tgz-$(USER)
 	curl http://www.sqlite.org/2015/sqlite-autoconf-3090200.tar.gz > tgz-$(USER)/sqlite-autoconf-3090200.tar.gz 
 
 tgz-$(USER)/nanomsg-1.0.0.tar.gz :
@@ -464,10 +470,15 @@
 	curl https://code.call-cc.org/releases/4.13.0/chicken-4.13.0.tar.gz > tgz-$(USER)/chicken-4.13.0.tar.gz
 
 tgz-$(USER)/ffcall.tar.gz :
 	wget -c -O tgz-$(USER)/ffcall.tar.gz 'http://www.kiatoa.com/fossils/ffcall/tarball?name=ffcall&uuid=trunk'
 
+$(CHICKEN_PREFIX)/bin/pg_config : tgz-$(USER)/postgresql-9.6.4.tar.gz
+	mkdir -p build-$(USER)/
+	tar xfz tgz-$(USER)/postgresql-9.6.4.tar.gz -C build-$(USER)
+	cd build-$(USER)/postgresql-9.6.4; ./configure --prefix=$(CHICKEN_PREFIX) --with-openssl; make; make install
+
 build-$(USER)/sqlite-autoconf-3090200/configure : tgz-$(USER)/sqlite-autoconf-3090200.tar.gz
 	mkdir -p build-$(USER);
 	cd build-$(USER); tar xf ../tgz-$(USER)/sqlite-autoconf-3090200.tar.gz
 
 $(CHICKEN_PREFIX)/lib/libnanomsg.so : tgz-$(USER)/nanomsg-1.0.0.tar.gz
@@ -500,11 +511,11 @@
 EGGS=srfi-69 srfi-42 sqlite3 iup canvas-draw typed-records md5 regex-case base64 \
 format dot-locking csv-xml z3 udp hostinfo directory-utils stack dbi crypt sha1 \
 posix-extras pathname-expand csv call-with-environment-variables s11n spiffy \
 uri-common intarweb http-client spiffy-request-vars spiffy-directory-listing \
 ansi-escape-sequences test slice rfc3339 uuid-lib filepath srfi-19 sparse-vectors \
-sql-de-lite fmt readline apropos json simple-exceptions rpc trace logpro refdb
+sql-de-lite fmt readline apropos json simple-exceptions rpc trace logpro refdb postgresql
 EGGSTARG=$(addsuffix .done,$(addprefix build-$(USER)/eggs-installed/,$(EGGS)))
 EGGSTARG2=$(addsuffix .done, $(EGGS))
 
 $(CHICKEN_PREFIX)/lib/libcallback.a : tgz-$(USER)/ffcall.tar.gz
 	cd tgz-$(USER); tar -xzvf ffcall.tar.gz 
@@ -519,10 +530,13 @@
 	cd build-$(USER)/chicken-4.13.0;make PLATFORM=linux PREFIX=$(CHICKEN_PREFIX) install
 
 chicken : $(CHICKEN_PREFIX)/bin/csi $(EGGSTARG2)
 	echo "Fake target to build prefix chicken"
 
+postgresql.done : $(CHICKEN_PREFIX)/bin/pg_config
+	CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install postgresql > postgresql.done
+
 nanomsg.done : $(CHICKEN_PREFIX)/lib/libnanomsg.so
 	CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install nanomsg > nanomsg.done
 
 iup.done : $(CHICKEN_PREFIX)/lib/libcallback.a
 	CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install -D no-library-checks -feature disable-iup-web -feature disable-iup-pplot -feature disable-iup-matrixex iup > iup.done

Index: utils/mk_wrapper
==================================================================
--- utils/mk_wrapper
+++ utils/mk_wrapper
@@ -88,14 +88,14 @@
 cat >> $target << EOF 
 if [[ \$(ulimit -a | grep 'open files' | awk '{print \$4}') -gt 10000 ]];then ulimit -n 10000;fi
 EOF
 
 # echo "#!/bin/bash" > $target
-# echo "exec $prefix/bin/.\$(lsb_release -sr)/$cmd \"\$@\"" >> $target
+# echo "exec $prefix/bin/.\$(lsb_release -sr)/bin/$cmd \"\$@\"" >> $target
 
 echo "lsbr=\$(lsb_release -sr)" >> $target
 if [ "$LD_LIBRARY_PATH" != "" ];then
   echo "source $prefix/bin/.\$lsbr/cfg.sh" >> $target
 fi
 
 # echo "if [[ -e \$lsbr ]];then source \$lsbr;fi" >> $target
-echo "exec $prefix/bin/.\$lsbr/$cmd \"\$@\"" >> $target
+echo "exec $prefix/bin/.\$lsbr/bin/$cmd \"\$@\"" >> $target