Index: trunk/Makefile.conf.in
===================================================================
--- trunk/Makefile.conf.in	(revision 33293)
+++ trunk/Makefile.conf.in	(revision 33294)
@@ -12,6 +12,13 @@
 	default    put /local/confdir_final_m /local/confdir; end
 end
 
+if /local/pcb/librnd_is_local
+then
+	put /local/pcb/librnd_inc [@-I$(ROOT)/@/local/pcb/librnd_root@@]
+else
+	put /local/pcb/librnd_inc {}
+end
+
 print [@# generated by ./configure, do not modify
 
 # Compatibility with autotools on DESTDIR - Debian really wants this
@@ -35,8 +42,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/pcb/CFLAGS@ @/local/pcb/librnd_inc@
+PCB_RND_C89FLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@ @/local/pcb/librnd_inc@
 
 # hidlib installation directories
 HL_LIBDIR=$(Install_root)@/local/prefix@/@/local/libarchdir@
Index: trunk/tests/conf/Makefile
===================================================================
--- trunk/tests/conf/Makefile	(revision 33293)
+++ trunk/tests/conf/Makefile	(revision 33294)
@@ -2,7 +2,7 @@
 include $(ROOT)/src_3rd/librnd-local/src/librnd/core/librnd.mak
 include $(ROOT)/Makefile.conf
 
-CFLAGS = $(PCB_RND_C89FLAGS) -I../.. -I../../src_3rd/librnd-local/src -I../../src_3rd -I../../src $(CFLAGS_LIBRND_FUNGW)
+CFLAGS = $(PCB_RND_C89FLAGS) -I../.. -I../../src_3rd -I../../src $(CFLAGS_LIBRND_FUNGW)
 LDLIBS = -lm $(LDFLAGS_LIBRND_FUNGW)
 
 LIB_HIDLIB=\
Index: trunk/tests/propedit/Makefile
===================================================================
--- trunk/tests/propedit/Makefile	(revision 33293)
+++ trunk/tests/propedit/Makefile	(revision 33294)
@@ -7,9 +7,8 @@
 LHT=$(ROOT)/src_3rd
 SRC=$(ROOT)/src
 SRC_3RD=$(ROOT)/src_3rd
-LIBRND=$(SRC_3RD)/librnd-local/src/librnd
 
-CFLAGS = $(PCB_RND_C89FLAGS) -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd -I$(ROOT)/src_3rd/librnd-local/src
+CFLAGS = $(PCB_RND_C89FLAGS) -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd
 LDLIBS = -lm
 LIB_OBJS = \
 	$(SRC)/librnd-hid.a \
Index: trunk/tests/strflags/Makefile
===================================================================
--- trunk/tests/strflags/Makefile	(revision 33293)
+++ trunk/tests/strflags/Makefile	(revision 33294)
@@ -2,7 +2,7 @@
 
 TRUNK=../..
 IO=$(TRUNK)/src_plugins/io_pcb
-CFLAGS = $(PCB_RND_C89FLAGS) -O3 -I$(TRUNK) -I$(TRUNK)/src -I$(IO) -I$(TRUNK)/src_3rd/librnd-local/src  -I$(TRUNK)/src_3rd
+CFLAGS = $(PCB_RND_C89FLAGS) -O3 -I$(TRUNK) -I$(TRUNK)/src -I$(IO)  -I$(TRUNK)/src_3rd
 LDLIBS = -lm
 GDS= $(TRUNK)/src_3rd/genvector/gds_char.o