Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 33291)
+++ trunk/scconfig/hooks.c	(revision 33292)
@@ -87,6 +87,8 @@
 	put("/local/pcb/want_byaccic", sfalse);
 	put("/local/pcb/dot_pcb_rnd", ".pcb-rnd");
 
+	put("/local/pcb/librnd_is_local", strue);
+	put("/local/pcb/librnd_root", "src_3rd/librnd-local/src");
 	return 0;
 }
 
@@ -111,8 +113,8 @@
 
 	rnd_calc_dialog_deps(); /* remove after librnd separation */
 
-	buildin = istrue(get("/target/librnd-local/src/librnd/dialogs/buildin"));
-	plugin = istrue(get("/target/librnd-local/src/librnd/dialogs/plugin"));
+	buildin = istrue(get("/target/librnd/dialogs/buildin"));
+	plugin = istrue(get("/target/librnd/dialogs/plugin"));
 
 	if (buildin) {
 		hook_custom_arg("buildin-draw_csect", NULL);
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 33291)
+++ trunk/src/Makefile.in	(revision 33292)
@@ -1,4 +1,4 @@
-append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd/librnd-local/src -I../src_3rd -I../src -I../src_3rd/liblihata }
+append /local/pcb/CFLAGS [@-I. -I.. -I../@/local/pcb/librnd_root@ -I../src_3rd -I../src -I../src_3rd/liblihata @]
 append /local/pcb/LDFLAGS cc/ldflags
 append /local/pcb/LDFLAGS cc/rdynamic
 append /local/pcb/LDFLAGS ?/local/pcb/cflags_profile
@@ -40,7 +40,7 @@
 # These files are to be generated before make dep is run
 put /local/pcb/DEPDEPS { $(LIBRND)/core/hidlib_conf_fields.h conf_core_fields.h conf_internal.c defpcb_internal.c buildin.c buildin.hidlib.c pcb_menu_default.c }
 
-include {../src_3rd/librnd-local/src/librnd/scconfig/template/debug.tmpasm}
+include [@../@/local/pcb/librnd_root@/librnd/scconfig/template/debug.tmpasm@]
 
 # main: objects
 # hidlib will be a library that provides:
@@ -294,10 +294,10 @@
 put /local/pcb/tmpasm/plugin_librnd   {../src_plugins/Plugin_librnd.tmpasm}
 put /local/pcb/tmpasm/disable         {../src_plugins/Disable.tmpasm}
 put /local/pcb/tmpasm/common_enabled  {../src_plugins/Common_enabled.tmpasm}
-put /local/pcb/tmpasm/plugin_sphash   {../src_3rd/librnd-local/src/librnd/scconfig/template/plugin_sphash.tmpasm}
-put /local/pcb/tmpasm/plugin_conf     {../src_3rd/librnd-local/src/librnd/scconfig/template/plugin_conf.tmpasm}
-put /local/pcb/tmpasm/plugin_intconf  {../src_3rd/librnd-local/src/librnd/scconfig/template/plugin_intconf.tmpasm}
-put /local/pcb/tmpasm/plugin_intmenu  {../src_3rd/librnd-local/src/librnd/scconfig/template/plugin_intmenu.tmpasm}
+put /local/pcb/tmpasm/plugin_sphash   [@../@/local/pcb/librnd_root@/librnd/scconfig/template/plugin_sphash.tmpasm@]
+put /local/pcb/tmpasm/plugin_conf     [@../@/local/pcb/librnd_root@/librnd/scconfig/template/plugin_conf.tmpasm@]
+put /local/pcb/tmpasm/plugin_intconf  [@../@/local/pcb/librnd_root@/librnd/scconfig/template/plugin_intconf.tmpasm@]
+put /local/pcb/tmpasm/plugin_intmenu  [@../@/local/pcb/librnd_root@/librnd/scconfig/template/plugin_intmenu.tmpasm@]
 
 include {../src_plugins/plugins_ALL.tmpasm}
 
@@ -347,7 +347,7 @@
 
 # plugin source
 PLUGDIR=$(ROOT)/src_plugins
-LIBRND_PLUGDIR=$(ROOT)/src_3rd/librnd-local/src/librnd/plugins
+LIBRND_PLUGDIR=$(ROOT)/@/local/pcb/librnd_root@/librnd/plugins
 
 # plugin source install - so that pcb-rnd runs from source properly
 PLUGIDIR=plugins
@@ -387,7 +387,7 @@
 LIBMINUID_LDFLAGS=@cc/ldflags@
 GENLIST_CFLAGS=@/local/pcb/CFLAGS_GENERIC@
 GENLIST_LDFLAGS=@cc/ldflags@
-LIBRND=../src_3rd/librnd-local/src/librnd
+LIBRND=../@/local/pcb/librnd_root@/librnd
 
 all:
 	$(MAKE) revcheck
@@ -572,8 +572,8 @@
 	$(SCCBOX) $(HOW) "librnd-poly.a" "$(HL_LIBDIR)/librnd-poly.a"
 	$(SCCBOX) $(HOW) "$(LIBRND)/core/librnd.mak" "$(HL_SHAREDIR)/librnd.mak"
 	$(SCCBOX) $(HOW) "../config.h" "$(HL_INCDIR)/core/config.h"
-	$(SCCBOX) $(HOW) "../src_3rd/puplug/util/puplug" "$(HL_LIBDIR)/librnd-local/src/librnd/puplug"
-	$(SCCBOX) $(HOW) "../scconfig/gen_conf.sh" "$(HL_LIBDIR)/librnd-local/src/librnd/gen_conf"
+	$(SCCBOX) $(HOW) "../src_3rd/puplug/util/puplug" "$(HL_LIBDIR)/librnd/puplug"
+	$(SCCBOX) $(HOW) "../scconfig/gen_conf.sh" "$(HL_LIBDIR)/librnd/gen_conf"
 	$(SCCBOX) $(HOW) "$(LIBRND)/scconfig/hooks_common.h" "$(HL_INCDIR)/scconfig/hooks_common.h"
 	$(SCCBOX) $(HOW) "$(LIBRND)/scconfig/plugin_3state.h" "$(HL_INCDIR)/scconfig/plugin_3state.h"
 	cd ../src_3rd/puplug && $(MAKE) install_hdr_ MKDR="../$(SCCBOX) mkdir -p" INST="../$(SCCBOX) $(HOW)" INCDIR="$(HL_INCDIR)/src_3rd/puplug"
@@ -670,7 +670,7 @@
 	$(MAKE) install_librnd_ HOW="uninstall"
 
 map_plugins:
-	cd ../src_plugins && PUPLUG=../src_3rd/puplug/util/puplug ../src_3rd/librnd-local/src/librnd/plugins/map_plugins.sh ../src_plugins ../src_3rd/librnd-local/src/librnd/plugins
+	cd ../src_plugins && PUPLUG=../src_3rd/puplug/util/puplug ../@/local/pcb/librnd_root@/librnd/plugins/map_plugins.sh ../src_plugins ../@/local/pcb/librnd_root@/librnd/plugins
 
 @]
 
@@ -677,13 +677,13 @@
 # generate explicit rules for .c -> .o
 put /local/comp/OBJS /local/pcb/OBJS
 put /local/comp/OBJS_C99 ?/local/pcb/OBJS_C99
-include {../src_3rd/librnd-local/src/librnd/scconfig/template/compile.tmpasm}
+include [@../@/local/pcb/librnd_root@/librnd/scconfig/template/compile.tmpasm@]
 
 print [@
 # for extern utils:@]
 
 put /local/comp/OBJS /local/pcb/OBJS_UTIL
-include {../src_3rd/librnd-local/src/librnd/scconfig/template/compile.tmpasm}
+include [@../@/local/pcb/librnd_root@/librnd/scconfig/template/compile.tmpasm@]
 
 # generate deps
 put /local/dep/CFLAGS /local/pcb/CFLAGS
@@ -691,7 +691,7 @@
 
 gsub /local/pcb/DEPSRCS {.o } {.c }
 append /local/dep/SRCS /local/pcb/DEPSRCS
-include {../src_3rd/librnd-local/src/librnd/scconfig/template/cdep.tmpasm}
+include [@../@/local/pcb/librnd_root@/librnd/scconfig/template/cdep.tmpasm@]
 
 # librnd separation, temporary workaround:
 # since pcb-rnd is trying to build everything without using librnd's build system
@@ -699,7 +699,7 @@
 # in a different subdir. The workaround is extending the file names with local,
 # relative path to that dir.
 put /local/pcb/buildin_hidlib_pups_fullpath ?/local/pcb/buildin_hidlib_pups
-gsub /local/pcb/buildin_hidlib_pups_fullpath {=} {=../src_3rd/librnd-local/src/librnd/plugins/}
+gsub /local/pcb/buildin_hidlib_pups_fullpath {=} [@=../@/local/pcb/librnd_root@/librnd/plugins/@]
 
 redir {../src_plugins/.builtin.pups}
 print [@# Autogenerated by ./configure - do NOT edit - contains the list of buildins
Index: trunk/util/bxl2txt/Makefile.in
===================================================================
--- trunk/util/bxl2txt/Makefile.in	(revision 33291)
+++ trunk/util/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: trunk/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- trunk/util/gsch2pcb-rnd/Makefile.in	(revision 33291)
+++ trunk/util/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 [@