Index: bxl2txt/Makefile.in
===================================================================
--- bxl2txt/Makefile.in	(revision 33291)
+++ bxl2txt/Makefile.in	(revision 33292)
@@ -2,9 +2,9 @@
 
 ROOT=../..
 PLUGDIR=$(ROOT)/src_plugins
-LIBRND=$(ROOT)/src_3rd/librnd-local/src/librnd
+LIBRND=$(ROOT)/@/local/pcb/librnd_root@/librnd
 PLUG=$(PLUGDIR)/io_bxl
-CFLAGS = @/local/pcb/c89flags@ @/local/pcb/CFLAGS@ -I$(PLUG) -I$(ROOT) -I$(ROOT)/src -I$(ROOT)/src_3rd/librnd-local/src -I$(ROOT)/src_3rd
+CFLAGS = @/local/pcb/c89flags@ @/local/pcb/CFLAGS@ -I$(PLUG) -I$(ROOT) -I$(ROOT)/src -I$(ROOT)/@/local/pcb/librnd_root@ -I$(ROOT)/src_3rd
 LDFLAGS = @/local/pcb/LDFLAGS@
 CC=@cc/cc@
 
Index: gsch2pcb-rnd/Makefile.in
===================================================================
--- gsch2pcb-rnd/Makefile.in	(revision 33291)
+++ gsch2pcb-rnd/Makefile.in	(revision 33292)
@@ -1,13 +1,14 @@
 put /local/pcb/CFLAGS cc/cflags
-append /local/pcb/CFLAGS {-I../.. -I../../src_3rd/librnd-local/src -I../../src_3rd -I../../src -I../../src_3rd/liblihata -DSCMDIR="\\"$(LIBDIR_INSTALLED)\\""}
+append /local/pcb/CFLAGS [@-I../.. -I../../@/local/pcb/librnd_root@ -I../../src_3rd -I../../src -I../../src_3rd/liblihata @]
+append /local/pcb/CFLAGS {-DSCMDIR="\\"$(LIBDIR_INSTALLED)\\""}
 append /local/pcb/LDFLAGS cc/ldflags
 append /local/pcb/LDFLAGS ?/target/libs/ldl
-include {../src_3rd/librnd-local/src/librnd/scconfig/template/debug.tmpasm}
+include [@../@/local/pcb/librnd_root@/librnd/scconfig/template/debug.tmpasm@]
 
 print [@
 ROOT=../..
 PLUGDIR=../../src_plugins
-LIBRND=../../src_3rd/librnd-local/src/librnd
+LIBRND=../../@/local/pcb/librnd_root@/librnd
 
 include $(LIBRND)/core/librnd.mak
 
@@ -86,7 +87,7 @@
 
 # generate explicit rules for .c -> .o
 put /local/comp/OBJS /local/pcb/OBJS
-include {../src_3rd/librnd-local/src/librnd/scconfig/template/compile.tmpasm}
+include [@../@/local/pcb/librnd_root@/librnd/scconfig/template/compile.tmpasm@]
 
 print [@