Index: RTT/Export.sh
===================================================================
--- RTT/Export.sh	(revision 36094)
+++ RTT/Export.sh	(revision 36095)
@@ -17,6 +17,13 @@
 # running from source
 	pcb_rnd_cd="$TRUNK/src"
 	pcb_rnd_bin="./pcb-rnd"
+
+	if test -x $TRUNK/src/pcb-rnd.wrap
+	then
+		pcb_rnd_bin="./pcb-rnd.wrap"
+	else
+		pcb_rnd_bin="./pcb-rnd"
+	fi
 fi
 
 fmt_args=""
Index: cam/test.sh
===================================================================
--- cam/test.sh	(revision 36094)
+++ cam/test.sh	(revision 36095)
@@ -5,9 +5,18 @@
 TESTS="grp_name type offs"
 PWD=`pwd`
 
+SRC=$ROOT/src
+if test -x $SRC/pcb-rnd.wrap
+then
+	PCB_RND=./pcb-rnd.wrap
+else
+	PCB_RND=./pcb-rnd
+fi
+
+
 run_pcb_rnd()
 {
-	(cd $ROOT/src && $DBG ./pcb-rnd "$@") 2>&1 | awk '
+	(cd $ROOT/src && $DBG $PCB_RND "$@") 2>&1 | awk '
 		/^[*][*][*] Exporting:/ { next }
 		/Warning: footprint library list error on/ { next }
 		/^[ \t]*$/ { next }
Index: conf/tests/Makefile
===================================================================
--- conf/tests/Makefile	(revision 36094)
+++ conf/tests/Makefile	(revision 36095)
@@ -1,3 +1,6 @@
+ROOT=../../..
+include $(ROOT)/Makefile.conf
+
 TESTS =  \
 	list_merge.diff \
 	list_set.diff \
Index: drc_query/Makefile
===================================================================
--- drc_query/Makefile	(revision 36094)
+++ drc_query/Makefile	(revision 36095)
@@ -1,4 +1,5 @@
 ROOT=../..
+include $(ROOT)/Makefile.conf
 
 SRC=$(ROOT)/src
 TDIR=../tests/drc_query
Index: menu/test_patch.sh
===================================================================
--- menu/test_patch.sh	(revision 36094)
+++ menu/test_patch.sh	(revision 36095)
@@ -4,6 +4,14 @@
 SRC=$ROOT/src
 CFG="-c rc/library_search_paths=dummy_lib -c rc/quiet=1"
 
+if test -x $SRC/pcb-rnd.wrap
+then
+	PCB_RND=./pcb-rnd.wrap
+else
+	PCB_RND=./pcb-rnd
+fi
+
+
 # call:
 # insert.lht 'MenuPatch(load, test, "insert.lht");'
 
@@ -18,7 +26,7 @@
 	MenuDebug(save, "d0.lht");
 '$2'
 	MenuDebug(save, "d1.lht");
-' | ./pcb-rnd $CFG -c rc/menu_file=base --gui batch 2>&1 | grep -v "^menu debug"
+' | $PCB_RND $CFG -c rc/menu_file=base --gui batch 2>&1 | grep -v "^menu debug"
 rmdir dummy_lib
 )
 
Index: query/Makefile
===================================================================
--- query/Makefile	(revision 36094)
+++ query/Makefile	(revision 36095)
@@ -1,4 +1,5 @@
 ROOT=../..
+include $(ROOT)/Makefile.conf
 
 SRC=$(ROOT)/src
 TDIR=../tests/query
Index: vendordrill/test_all.sh
===================================================================
--- vendordrill/test_all.sh	(revision 36094)
+++ vendordrill/test_all.sh	(revision 36095)
@@ -4,10 +4,16 @@
 SRC="$ROOT/src"
 TDIR="../tests/vendordrill"
 GFLT="../pupfilter.sh"
-PCBRND="./pcb-rnd"
 GLOBARGS="-c rc/library_search_paths=../tests/RTT/lib -c rc/quiet=1"
 
+if test -x $SRC/pcb-rnd.wrap
+then
+	PCBRND=./pcb-rnd.wrap
+else
+	PCBRND=./pcb-rnd
+fi
 
+
 run_pcb_rnd() {
 local brd="`pwd`/$1"