Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -21,10 +21,12 @@
 DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
 MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
 
 CSIPATH=$(shell which csi)
 CKPATH=$(shell dirname $(shell dirname $(CSIPATH)))
+# ARCHSTR=$(shell uname -m)_$(shell uname -r)
+ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
 all : mtest dboard newdboard txtdb
 
 refdb : txtdb/txtdb.scm
 	csc -I txtdb txtdb/txtdb.scm -o refdb
@@ -38,26 +40,10 @@
 newdboard : newdashboard.scm $(OFILES) $(GOFILES)
 	csc $(OFILES) $(GOFILES) newdashboard.scm -o newdboard
 
 $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm
 	csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl
-
-deploytarg/libiupcd.so : $(CKPATH)/lib/libiupcd.so
-	for i in iup im cd av call sqlite; do \
-	  cp $(CKPATH)/lib/lib$$i* deploytarg/ ; \
-	done
-	cp $(CKPATH)/include/*.h deploytarg
-
-# puts deployed megatest in directory "megatest"
-deploytarg/megatest : $(OFILES) megatest.o
-	csc -deploy $(CSCOPTS) $(OFILES) megatest.scm
-	rsync -av megatest/ deploytarg/
-
-deploytarg/dashboard :  $(OFILES) $(GOFILES)
-	csc -deploy $(OFILES) $(GOFILES) dashboard.scm
-	rsync -av dashboard/ deploytarg/
-
 
 # Special dependencies for the includes
 tests.o db.o launch.o runs.o dashboard-tests.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o megatest.o : db_records.scm
 tests.o runs.o dashboard.o dashboard-tests.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
@@ -76,29 +62,25 @@
 $(OFILES) $(GOFILES) : common_records.scm 
 
 %.o : %.scm
 	csc $(CSCOPTS) -c $<
 
-$(PREFIX)/bin/mtest : mtest
+$(PREFIX)/bin/.$(ARCHSTR)/mtest : $(PREFIX)/bin/.$(ARCHSTR) mtest
 	@echo Installing to PREFIX=$(PREFIX)
-	$(INSTALL) mtest $(PREFIX)/bin/mtest
+	$(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest
 	utils/mk_wrapper $(PREFIX) mtest > $(PREFIX)/bin/megatest
 	chmod a+x $(PREFIX)/bin/megatest
 
-$(PREFIX)/bin/newdboard : newdboard
-	$(INSTALL) newdboard $(PREFIX)/bin/newdboard
-	utils/mk_wrapper $(PREFIX) newdboard > $(PREFIX)/bin/newdashboard
-	chmod a+x $(PREFIX)/bin/newdashboard
+# $(PREFIX)/bin/newdboard : newdboard
+# 	$(INSTALL) newdboard $(PREFIX)/bin/newdboard
+# 	utils/mk_wrapper $(PREFIX) newdboard > $(PREFIX)/bin/newdashboard
+#	chmod a+x $(PREFIX)/bin/newdashboard
 
 $(HELPERS) : utils/mt_* 
 	$(INSTALL) $< $@
 	chmod a+x $@
 
-$(DEPLOYHELPERS) : utils/mt_*
-	$(INSTALL) $< $@
-	chmod a+X $@
-
 $(PREFIX)/bin/mt_xterm : utils/mt_xterm
 	$(INSTALL) $< $@
 	chmod a+x $@
 
 $(PREFIX)/bin/nbfake : utils/nbfake
@@ -125,33 +107,52 @@
 	$(INSTALL) $< $@
 	chmod a+x $@
 
 
 # install dashboard as dboard so wrapper script can be called dashboard
-$(PREFIX)/bin/dboard : dboard $(FILES)
-	$(INSTALL) dboard $(PREFIX)/bin/dboard
+$(PREFIX)/bin/.$(ARCHSTR)/dboard : $(PREFIX)/bin/.$(ARCHSTR) dboard $(FILES)
+	$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
 	utils/mk_wrapper $(PREFIX) dboard > $(PREFIX)/bin/dashboard
 	chmod a+x $(PREFIX)/bin/dashboard
 
-install : bin $(PREFIX)/bin/mtest $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
-          $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/newdboard $(PREFIX)/bin/refdb $(PREFIX)/bin/mt_xterm $(PREFIX)/bin/revtagfsl
+install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
+          $(PREFIX)/bin/nbfind $$(PREFIX)/bin/loadrunner $(PREFIX)/bin/nbload $(PREFIX)/bin/refdb $(PREFIX)/bin/mt_xterm
+
+$(PREFIX)/bin/.$(ARCHSTR) : 
+	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)
+
+test: tests/tests.scm
+	cd tests;csi -I .. -b -n tests.scm
+
+clean : 
+	rm -f $(OFILES) $(GOFILES) megatest dboard dboard.o megatest.o dashboard.o
+
+# Deploy section (not complete yet)
+#
+$(DEPLOYHELPERS) : utils/mt_*
+	$(INSTALL) $< $@
+	chmod a+X $@
 
 deploytarg/apropos.so : Makefile
 	for i in apropos base64 canvas-draw csv-xml directory-utils dot-locking extras fmt format hostinfo http-client intarweb json md5 message-digest posix posix-extras readline regex regex-case s11n spiffy spiffy-request-vars sqlite3 srfi-1 srfi-18 srfi-69 tcp test uri-common check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile opensll openssl lookup-table list-utils stack; do \
 	chicken-install -prefix deploytarg -deploy $$i;done
 
 deploytarg/libsqlite3.so : 
 	CSC_OPTIONS="-Ideploytarg -Ldeploytarg" $CHICKEN_INSTALL -prefix deploytarg -deploy sqlite3
 
-
-
 deploy : deploytarg/megatest deploytarg/dashboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/nbfind deploytarg/libiupcd.so deploytarg/apropos.so
 
-
-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 dashboard.o
+deploytarg/libiupcd.so : $(CKPATH)/lib/libiupcd.so
+	for i in iup im cd av call sqlite; do \
+	  cp $(CKPATH)/lib/lib$$i* deploytarg/ ; \
+	done
+	cp $(CKPATH)/include/*.h deploytarg
+
+# puts deployed megatest in directory "megatest"
+deploytarg/megatest : $(OFILES) megatest.o
+	csc -deploy $(CSCOPTS) $(OFILES) megatest.scm
+	rsync -av megatest/ deploytarg/
+
+deploytarg/dashboard :  $(OFILES) $(GOFILES)
+	csc -deploy $(OFILES) $(GOFILES) dashboard.scm
+	rsync -av dashboard/ deploytarg/
+

Index: utils/Makefile.installall
==================================================================
--- utils/Makefile.installall
+++ utils/Makefile.installall
@@ -41,11 +41,14 @@
 # Select version of chicken, sqlite3 etc
 CHICKEN_VERSION=4.8.0
 SQLITE3_VERSION=3071401
 
 # 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
+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 \
+     spiffy-directory-listing ssax sxml-serializer sxml-modifications
 
 #
 # Derived variables
 #
 
@@ -81,22 +84,27 @@
 
 IUPFILES=cd-5.5.1_Linux$(KTYPE)_$(ARCHSIZE)lib.tar.gz im-3.8_Linux$(KTYPE)_$(ARCHSIZE)lib.tar.gz iup-3.6_Linux$(KTYPE)_$(ARCHSIZE)lib.tar.gz
 CSCLIBS=$(shell echo $(LD_LIBRARY_PATH) | sed 's/:/ -L/g')
 CSC_OPTIONS=-I$(PREFIX)/include -L$(CSCLIBS)
 
-all : chkn eggs iup
+all : chkn eggs libiup sqlite3 logprobin mutils
 
 chkn : $(CHICKEN_INSTALL)
 
 eggs : $(EGGSOFILES)
 
 sqlite3 :  $(CHICKEN_EGG_DIR)/sqlite3.so
 
-iup : $(PREFIX)/lib/libavcall.a $(CHICKEN_EGG_DIR)/iup.so $(CHICKEN_EGG_DIR)/canvas-draw.so
+libiup : $(PREFIX)/lib/libavcall.a $(CHICKEN_EGG_DIR)/iup.so $(CHICKEN_EGG_DIR)/canvas-draw.so
+
+logprobin : $(PREFIX)/bin/logpro
+
+$(PREFIX)/bin/logpro : $(CHICKEN_EGG_DIR)/regex-literals.so
+	$(CHICKEN_INSTALL) logpro
 
 # Silly rule to make installing eggs more makeish, I don't understand why I need the basename
-$(CHICKEN_EGG_DIR)/%.so : %.flag
+$(CHICKEN_EGG_DIR)/%.so : eggflags/%.flag
 	$(CHICKEN_INSTALL) $(PROX) $(shell basename $*)
 
 $(EGGFLAGS) : # $(CHICKEN_INSTALL)
 	mkdir -p eggflags
 	touch $(EGGFLAGS)
@@ -131,10 +139,11 @@
 	(cd sqlite-autoconf-$(SQLITE3_VERSION);./configure --prefix=$(PREFIX);make;make install)
 
 $(CHICKEN_EGG_DIR)/sqlite3.so : $(PREFIX)/bin/sqlite3
 	CSC_OPTIONS="-I$(PREFIX)/include -L$(PREFIX)/lib" $(CHICKEN_INSTALL) $(PROX) sqlite3
 
+mutils : $(CHICKEN_EGG_DIR)/margs.so $(CHICKEN_EGG_DIR)/qtree.so # $(CHICKEN_EGG_DIR)/dbi.so 
 
 # Get and install my various utilities that haven't been eggified yet.
 opensrc/margs/margs.scm opensrc/dbi/dbi.scm opensrc/qtree/qtree.scm : $(CHICKEN_INSTALL) $(CHICKEN_EGG_DIR)/sqlite3.so
 	mkdir -p opensrc
 	cd opensrc;if [ ! -e opensrc.fossil ]; then fossil clone http://www.kiatoa.com/fossils/opensrc opensrc.fossil; fi
@@ -147,13 +156,10 @@
 	cd opensrc/margs;chicken-install
 
 $(CHICKEN_EGG_DIR)/qtree.so : opensrc/qtree/qtree.scm
 	cd opensrc/qtree;chicken-install
 
-# $(CHICKEN_EGG_DIR)/dbi.so # Don't include as requires postgres
-mattseggs : $(CHICKEN_EGG_DIR)/margs.so $(CHICKEN_EGG_DIR)/qtree.so
-
 # 
 # IUP
 #
 
 ffcall.tar.gz :

Index: utils/mk_wrapper
==================================================================
--- utils/mk_wrapper
+++ utils/mk_wrapper
@@ -9,8 +9,10 @@
   echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 else
   echo "INFO: LD_LIBRARY_PATH not set" >&2
 fi
 
-fullcmd="exec $prefix/bin/$cmd"
+# echo 'ARCHSTR=$(uname -m)_$(uname -r)'
+
+fullcmd="exec $prefix/bin/.${MACHTYPE}/$cmd"
 
 echo "$fullcmd \"\$@\""