Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -21,11 +21,14 @@
 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")
+# BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE")
+# ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr)
+ARCHSTR=$(shell lsb_release -sr)
+# ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
 all : mtest dboard newdboard txtdb
 
 refdb : txtdb/txtdb.scm
 	csc -I txtdb txtdb/txtdb.scm -o refdb

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