Index: Makefile
===================================================================
--- Makefile	(revision 33844)
+++ 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