Index: Makefile.conf.in
===================================================================
--- Makefile.conf.in	(revision 34715)
+++ Makefile.conf.in	(revision 34716)
@@ -12,13 +12,6 @@
 	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@ -I$(ROOT)/@/local/pcb/librnd_root@/../src_3rd@]
-else
-	put /local/pcb/librnd_inc {}
-end
-
 print [@# generated by ./configure, do not modify
 
 # Compatibility with autotools on DESTDIR - Debian really wants this
@@ -42,13 +35,13 @@
 PCB_RND_VER=@/local/version@
 PCB_RND_VER_MAJOR=@/local/version_major@
 
-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@
+PCB_RND_CFLAGS=@?cc/argstd/std_c99@ @/local/pcb/CFLAGS@
+PCB_RND_C89FLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@
 
 # hidlib installation directories
-HL_LIBDIR=$(Install_root)@/local/prefix@/@/local/libarchdir@
-HL_SHAREDIR=$(Install_root)@/local/prefix@/share/librnd
-HL_INCDIR=$(Install_root)@/local/prefix@/include/librnd
+HL_LIBDIR=$(Install_root)@/local/pcb/librnd_prefix@/@/local/libarchdir@
+HL_SHAREDIR=$(Install_root)@/local/pcb/librnd_prefix@/share/librnd
+HL_INCDIR=$(Install_root)@/local/pcb/librnd_prefix@/include/librnd
 
 
 # The installation directoried to be used from within binaries (with