Index: trunk/Makefile.conf.in
===================================================================
--- trunk/Makefile.conf.in	(revision 37100)
+++ trunk/Makefile.conf.in	(revision 37101)
@@ -2,8 +2,8 @@
 put /local/pcb/CFLAGS_GENERIC cc/cflags
 append /local/pcb/CFLAGS_GENERIC cc/fpic
 append /local/pcb/CFLAGS_GENERIC ?/local/pcb/cflags_profile
-put /local/pcb/CFLAGS /local/pcb/CFLAGS_GENERIC
-uniq /local/pcb/CFLAGS
+put /local/rnd/CFLAGS /local/pcb/CFLAGS_GENERIC
+uniq /local/rnd/CFLAGS
 uniq /local/pcb/CFLAGS_GENERIC
 
 print [@# generated by ./configure, do not modify
@@ -29,8 +29,8 @@
 PCB_RND_VER=@/local/version@
 PCB_RND_VER_MAJOR=@/local/version_major@
 
-PCB_RND_CFLAGS=@?cc/argstd/std_c99@ @/local/pcb/CFLAGS@
-PCB_RND_C89FLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@
+PCB_RND_CFLAGS=@?cc/argstd/std_c99@ @/local/rnd/CFLAGS@
+PCB_RND_C89FLAGS=@/local/pcb/c89flags@ @/local/rnd/CFLAGS@
 
 # The installation directoried to be used from within binaries (with
 # install_root/DESTDIR removed)
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 37100)
+++ trunk/src/Makefile.in	(revision 37101)
@@ -1,15 +1,15 @@
-append /local/pcb/CFLAGS [@-I. -I.. -I@/local/pcb/librnd_prefix@/include/librnd4 -I@/local/pcb/librnd_prefix@/include/librnd4/librnd/src_3rd @?/local/pcb/librnd_extra_inc@ -I../src_3rd -I../src -I../src_3rd/liblihata @]
-append /local/pcb/LDFLAGS [@@?/local/pcb/librnd_extra_ldf@@]
-append /local/pcb/LDFLAGS cc/ldflags
-append /local/pcb/LDFLAGS cc/rdynamic
-append /local/pcb/LDFLAGS ?/local/pcb/cflags_profile
-append /local/pcb/LDFLAGS ?libs/script/fungw/ldflags
-append /local/pcb/LDFLAGS ?/local/librnd/fungw/ldflags
+append /local/rnd/CFLAGS [@-I. -I.. -I@/local/pcb/librnd_prefix@/include/librnd4 -I@/local/pcb/librnd_prefix@/include/librnd4/librnd/src_3rd @?/local/pcb/librnd_extra_inc@ -I../src_3rd -I../src -I../src_3rd/liblihata @]
+append /local/rnd/LDFLAGS [@@?/local/pcb/librnd_extra_ldf@@]
+append /local/rnd/LDFLAGS cc/ldflags
+append /local/rnd/LDFLAGS cc/rdynamic
+append /local/rnd/LDFLAGS ?/local/pcb/cflags_profile
+append /local/rnd/LDFLAGS ?libs/script/fungw/ldflags
+append /local/rnd/LDFLAGS ?/local/librnd/fungw/ldflags
 put /local/pcb/DEPCFLAGS {}
 put /local/pcb/OBJS_3RDLIB {}
 
 if /local/pcb/want_static then
-	append /local/pcb/LDFLAGS { -static}
+	append /local/rnd/LDFLAGS { -static}
 end
 
 # static librd link: need to get all librnd ldlibs
@@ -190,7 +190,7 @@
 include {../src_plugins/plugins_ALL.tmpasm}
 
 # Lesstif requires that -lXm is before -lXt or else there is a runtime BadWindow error
-order /local/pcb/LDFLAGS {-lXm} {before} {-lXt}
+order /local/rnd/LDFLAGS {-lXm} {before} {-lXt}
 
 # ---- logic ----
 
@@ -200,7 +200,7 @@
 uniq /local/pcb/OBJS_C99
 uniq /local/pcb/OBJS_3RDLIB
 uniq /local/pcb/OBJS_UTIL
-uniq /local/pcb/CFLAGS
+uniq /local/rnd/CFLAGS
 uniq /local/pcb/CFLAGS_GENERIC
 uniq /local/pcb/LIBS
 uniq /local/pcb/LIBS_PRE
@@ -218,14 +218,14 @@
 # apple requires multiple "-framework something" instead of -lsomething
 # we need to keep all -frameworks but uniq would keep only the first if it
 # is a word on its own
-gsub /local/pcb/LDFLAGS {-framework } {-framework-}
-uniq /local/pcb/LDFLAGS
-gsub /local/pcb/LDFLAGS {-framework-} {-framework }
+gsub /local/rnd/LDFLAGS {-framework } {-framework-}
+uniq /local/rnd/LDFLAGS
+gsub /local/rnd/LDFLAGS {-framework-} {-framework }
 
 
 # workaround: lately gcc doesn't like -ansi and the ((unused)) attribute
 # together, which happens in --debug for C99
-put /local/pcb/C99CFLAGS /local/pcb/CFLAGS
+put /local/pcb/C99CFLAGS /local/rnd/CFLAGS
 sub /local/pcb/C99CFLAGS {-ansi } {}
 
 # Makefile, static
@@ -258,8 +258,8 @@
 OBJS_UTIL=@/local/pcb/OBJS_UTIL@
 SRCS=@/local/pcb/SRCS@
 CFLAGS=@?cc/argstd/std_c99@ @/local/pcb/C99CFLAGS@
-C89FLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@
-LDFLAGS=@/local/pcb/LDFLAGS@
+C89FLAGS=@/local/pcb/c89flags@ @/local/rnd/CFLAGS@
+LDFLAGS=@/local/rnd/LDFLAGS@
 LIBS_PRE=@/local/pcb/LIBS_PRE@
 LIBS=@/local/pcb/LIBS@ @libs/socket/socket/ldflags@ @/local/pcb/librnd_extra_ldlibs@ -lm @?/target/libs/ldl@
 LIBS_3RD=@/local/pcb/LIBS_3RD@
@@ -397,7 +397,7 @@
 include [@@/local/pcb/librnd_template@/compile.tmpasm@]
 
 # generate deps
-put /local/dep/CFLAGS /local/pcb/CFLAGS
+put /local/dep/CFLAGS /local/rnd/CFLAGS
 put /local/dep/SRCS /local/pcb/SRCS
 
 gsub /local/pcb/DEPSRCS {.o } {.c }
Index: trunk/src_plugins/Buildin.tmpasm
===================================================================
--- trunk/src_plugins/Buildin.tmpasm	(revision 37100)
+++ trunk/src_plugins/Buildin.tmpasm	(revision 37101)
@@ -15,8 +15,8 @@
 
 append /local/pcb/OBJS            ?/local/pcb/mod/OBJS
 append /local/pcb/OBJS_C99        ?/local/pcb/mod/OBJS_C99
-append /local/pcb/LDFLAGS         /local/pcb/mod/LDFLAGS
-append /local/pcb/CFLAGS          /local/pcb/mod/CFLAGS
+append /local/rnd/LDFLAGS         /local/pcb/mod/LDFLAGS
+append /local/rnd/CFLAGS          /local/pcb/mod/CFLAGS
 append /local/pcb/RULES [@
 
 mod_@/local/pcb/mod@: all
Index: trunk/util/bxl2txt/Makefile.in
===================================================================
--- trunk/util/bxl2txt/Makefile.in	(revision 37100)
+++ trunk/util/bxl2txt/Makefile.in	(revision 37101)
@@ -7,8 +7,8 @@
 include $(LIBRND_SHAREDIR)/librnd.mak
 
 PLUG=$(PLUGDIR)/io_bxl
-CFLAGS = @/local/pcb/c89flags@ @/local/pcb/CFLAGS@ @?/local/pcb/librnd_extra_inc@ -I$(PLUG) -I$(ROOT) -I$(ROOT)/src -I$(LIBRND_INCDIR) -I$(ROOT)/src_3rd
-LDFLAGS = @/local/pcb/LDFLAGS@
+CFLAGS = @/local/pcb/c89flags@ @/local/rnd/CFLAGS@ @?/local/pcb/librnd_extra_inc@ -I$(PLUG) -I$(ROOT) -I$(ROOT)/src -I$(LIBRND_INCDIR) -I$(ROOT)/src_3rd
+LDFLAGS = @/local/rnd/LDFLAGS@
 CC=@cc/cc@
 
 
Index: trunk/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- trunk/util/gsch2pcb-rnd/Makefile.in	(revision 37100)
+++ trunk/util/gsch2pcb-rnd/Makefile.in	(revision 37101)
@@ -1,8 +1,8 @@
-put /local/pcb/CFLAGS cc/cflags
-append /local/pcb/CFLAGS [@-I../.. -I@/local/pcb/librnd_prefix@/include/librnd4 -I@/local/pcb/librnd_prefix@/include/librnd4/librnd/src_3rd -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
+put /local/rnd/CFLAGS cc/cflags
+append /local/rnd/CFLAGS [@-I../.. -I@/local/pcb/librnd_prefix@/include/librnd4 -I@/local/pcb/librnd_prefix@/include/librnd4/librnd/src_3rd -I../../src_3rd -I../../src -I../../src_3rd/liblihata @]
+append /local/rnd/CFLAGS {-DSCMDIR="\\"$(LIBDIR_INSTALLED)\\""}
+append /local/rnd/LDFLAGS cc/ldflags
+append /local/rnd/LDFLAGS ?/target/libs/ldl
 include [@@/local/pcb/librnd_template@/debug.tmpasm@]
 
 print [@
@@ -12,8 +12,8 @@
 
 include $(LIBRND_SHAREDIR)/librnd.mak
 
-CFLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@ @?/local/pcb/librnd_extra_inc@ $(CFLAGS_LIBRND_FUNGW)
-LDFLAGS=-lm @?/local/pcb/librnd_extra_ldf@ @/local/pcb/LDFLAGS@ $(LDFLAGS_LIBRND_FUNGW)
+CFLAGS=@/local/pcb/c89flags@ @/local/rnd/CFLAGS@ @?/local/pcb/librnd_extra_inc@ $(CFLAGS_LIBRND_FUNGW)
+LDFLAGS=-lm @?/local/pcb/librnd_extra_ldf@ @/local/rnd/LDFLAGS@ $(LDFLAGS_LIBRND_FUNGW)
 LDF_LIBRND=-lrnd-hid -lrnd-core -lrnd-3rd
 CC=@cc/cc@
 @]
@@ -28,8 +28,8 @@
 
 put /local/pcb/RULES {}
 put /local/pcb/OBJS {}
-put /local/pcb/LDFLAGS {}
-put /local/pcb/CFLAGS {}
+put /local/rnd/LDFLAGS {}
+put /local/rnd/CFLAGS {}
 put /local/pcb/buildin_init_code {}
 put /local/pcb/buildin_init_extern {}
 
@@ -39,8 +39,8 @@
 
 
 FP_OBJS    = @/local/pcb/OBJS@ ../../src/conf_core.o
-FP_LDFLAGS = @/local/pcb/LDFLAGS@
-FP_CFLAGS  = @/local/pcb/CFLAGS@
+FP_LDFLAGS = @/local/rnd/LDFLAGS@
+FP_CFLAGS  = @/local/rnd/CFLAGS@
 OBJS = \
  gsch2pcb.o \
  help.o \