Index: RTT/Export.sh
===================================================================
--- RTT/Export.sh	(revision 33844)
+++ RTT/Export.sh	(revision 33845)
@@ -12,6 +12,9 @@
 COMPARE=compare
 SCCBOX=$TRUNK/scconfig/sccbox
 
+#TODO: remove this once librnd separation id finished
+export LD_LIBRARY_PATH=`pwd`/$TRUNK/src_3rd/librnd-local/src
+
 if test -z "$pcb_rnd_bin"
 then
 # running from source
Index: cam/test.sh
===================================================================
--- cam/test.sh	(revision 33844)
+++ cam/test.sh	(revision 33845)
@@ -5,6 +5,9 @@
 TESTS="grp_name type offs"
 PWD=`pwd`
 
+#TODO: remove this once librnd separation id finished
+export LD_LIBRARY_PATH=$PWD/$ROOT/src_3rd/librnd-local/src
+
 run_pcb_rnd()
 {
 	(cd $ROOT/src && $DBG ./pcb-rnd "$@") 2>&1 | awk '
Index: drc_pstk_hbrk/tester
===================================================================
--- drc_pstk_hbrk/tester	(revision 33844)
+++ drc_pstk_hbrk/tester	(revision 33845)
@@ -1,15 +1,25 @@
 #!/bin/sh
 
+ROOT=../..
+PWD=`pwd`
+
 # Run pcb-rnd on each test case and check if drc found errors where it should
 # and does not find anything where it shouldn't. Run with -v to print each case.
 
 verbose=0
 
+#TODO: remove this once librnd separation id finished
+export LD_LIBRARY_PATH=$PWD/$ROOT/src_3rd/librnd-local/src
+
 do_test()
 {
+local fn=$PWD/$1
+(
+cd $ROOT/src
 echo '
 drc()
-' | pcb-rnd --gui batch "$1" 2>/dev/null | grep -i broken
+' | ./pcb-rnd --gui batch "$1" 2>/dev/null | grep -i broken
+)
 }
 
 should_break()
Index: drc_query/Makefile
===================================================================
--- drc_query/Makefile	(revision 33844)
+++ drc_query/Makefile	(revision 33845)
@@ -10,6 +10,10 @@
 thickness.diff overlap.diff netint.diff dwg_area.diff fullpoly.diff \
 zone_clr.diff
 
+#TODO: remove this once librnd separation id finished
+LDLIB=export LD_LIBRARY_PATH=`pwd`/$(ROOT)/src_3rd/librnd-local/src &&
+
+
 test: $(TESTS)
 
 all:
@@ -18,37 +22,37 @@
 	@diff -u thickness.ref thickness.out && rm thickness.out
 
 thickness.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/thickness.lht --gui batch | $(FLT) > $(TDIR)/thickness.out
+	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/thickness.lht --gui batch | $(FLT) > $(TDIR)/thickness.out
 
 overlap.diff: overlap.out
 	@diff -u overlap.ref overlap.out && rm overlap.out
 
 overlap.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/overlap.lht --gui batch | $(FLT) > $(TDIR)/overlap.out
+	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/overlap.lht --gui batch | $(FLT) > $(TDIR)/overlap.out
 
 netint.diff: netint.out
 	@diff -u netint.ref netint.out && rm netint.out
 
 netint.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/netint.lht --gui batch | $(FLT) > $(TDIR)/netint.out
+	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/netint.lht --gui batch | $(FLT) > $(TDIR)/netint.out
 
 dwg_area.diff: dwg_area.out
 	@diff -u dwg_area.ref dwg_area.out && rm dwg_area.out
 
 dwg_area.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/dwg_area.lht --gui batch | $(FLT) > $(TDIR)/dwg_area.out
+	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/dwg_area.lht --gui batch | $(FLT) > $(TDIR)/dwg_area.out
 
 fullpoly.diff: fullpoly.out
 	@diff -u fullpoly.ref fullpoly.out && rm fullpoly.out
 
 fullpoly.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/fullpoly.lht --gui batch | $(FLT) > $(TDIR)/fullpoly.out
+	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/fullpoly.lht --gui batch | $(FLT) > $(TDIR)/fullpoly.out
 
 zone_clr.diff: zone_clr.out
 	@diff -u zone_clr.ref zone_clr.out && rm zone_clr.out
 
 zone_clr.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/zone_clr.lht --gui batch | $(FLT) > $(TDIR)/zone_clr.out
+	@$(LDLIB) cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/zone_clr.lht --gui batch | $(FLT) > $(TDIR)/zone_clr.out
 
 clean:
 	@echo "a" > dummy.out
Index: menu/test_patch.sh
===================================================================
--- menu/test_patch.sh	(revision 33844)
+++ menu/test_patch.sh	(revision 33845)
@@ -1,8 +1,12 @@
 #!/bin/sh
 
-SRC=../../src
+ROOT=../..
+SRC=$ROOT/src
 CFG="-c rc/library_search_paths=dummy_lib -c rc/quiet=1"
 
+#TODO: remove this once librnd separation id finished
+export LD_LIBRARY_PATH=`pwd`/$ROOT/src_3rd/librnd-local/src
+
 # call:
 # insert.lht 'MenuPatch(load, test, "insert.lht");'
 
Index: pcbflags/test.sh
===================================================================
--- pcbflags/test.sh	(revision 33844)
+++ pcbflags/test.sh	(revision 33845)
@@ -1,7 +1,11 @@
 #!/bin/sh
-src_dir=../../src
+ROOT=../..
+src_dir=$ROOT/src
 pwd=`pwd`
 
+#TODO: remove this once librnd separation id finished
+export LD_LIBRARY_PATH=$pwd/$ROOT/src_3rd/librnd-local/src
+
 # $1 must be a .pcb file name
 run_pcb()
 {
Index: query/Makefile
===================================================================
--- query/Makefile	(revision 33844)
+++ query/Makefile	(revision 33845)
@@ -5,6 +5,10 @@
 PCBRND=./pcb-rnd
 GLOBARGS=-c rc/library_search_paths=../tests/RTT/lib -c rc/quiet=1
 
+#TODO: remove this once librnd separation id finished
+LDLIB=export LD_LIBRARY_PATH=`pwd`/$(ROOT)/src_3rd/librnd-local/src &&
+
+
 TESTS = \
 	action.diff getconf.diff getconf2.diff
 
@@ -16,19 +20,19 @@
 	@diff -u action.ref action.out && rm action.out
 
 action.out: FORCE
-	@cd $(SRC) && echo 'query(eval, "action(\"message\", \"hello\", @.x)")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/action.out
+	@$(LDLIB) cd $(SRC) && echo 'query(eval, "action(\"message\", \"hello\", @.x)")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/action.out
 
 getconf.diff: getconf.out
 	@diff -u getconf.ref getconf.out && rm getconf.out
 
 getconf.out: FORCE
-	@cd $(SRC) && echo 'query(eval, "@ thus getconf(\"editor/grid_unit\")")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf.out
+	@$(LDLIB) cd $(SRC) && echo 'query(eval, "@ thus getconf(\"editor/grid_unit\")")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf.out
 
 getconf2.diff: getconf2.out
 	@diff -u getconf2.ref getconf2.out && rm getconf2.out
 
 getconf2.out: FORCE
-	@cd $(SRC) && echo 'query(eval, "@ thus $$min_drill")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf2.out
+	@$(LDLIB) cd $(SRC) && echo 'query(eval, "@ thus $$min_drill")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf2.out
 
 clean:
 	@echo "a" > dummy.out