Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -20,10 +20,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
@@ -37,26 +39,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
@@ -74,29 +60,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
@@ -123,33 +105,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/nbload $(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/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/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 \"\$@\""