Index: trunk/Makefile.conf.in
===================================================================
--- trunk/Makefile.conf.in	(revision 34858)
+++ trunk/Makefile.conf.in	(revision 34859)
@@ -40,7 +40,7 @@
 
 # hidlib installation directories
 HL_LIBDIR=$(Install_root)@/local/pcb/librnd_prefix@/@/local/libarchdir@
-HL_SHAREDIR=$(Install_root)@/local/pcb/librnd_prefix@/share/librnd
+HL_SHAREDIR=$(Install_root)@/local/pcb/librnd_prefix@/share/librnd3
 HL_INCDIR=$(Install_root)@/local/pcb/librnd_prefix@/include/librnd
 
 
@@ -50,6 +50,6 @@
 
 # Where librnd is installed, full path to the .mak file to auto-setup
 LIBRND_PREFIX=@/local/pcb/librnd_prefix@
-LIBRND_MAK=$(LIBRND_PREFIX)/share/librnd/librnd.mak
+LIBRND_MAK=$(LIBRND_PREFIX)/share/librnd3/librnd.mak
 
 @]
Index: trunk/doc/developer/packaging/packages.sh
===================================================================
--- trunk/doc/developer/packaging/packages.sh	(revision 34858)
+++ trunk/doc/developer/packaging/packages.sh	(revision 34859)
@@ -4,9 +4,9 @@
 
 LIBRND_ROOT=`make -f librnd_root.mk`
 
-if test -f $LIBRND_ROOT/share/librnd/librnd_packages.sh
+if test -f $LIBRND_ROOT/share/librnd3/librnd_packages.sh
 then
-	. $LIBRND_ROOT/share/librnd/librnd_packages.sh
+	. $LIBRND_ROOT/share/librnd3/librnd_packages.sh
 else
 	echo "librnd installation not found" >&2
 	exit 1
@@ -274,7 +274,7 @@
 		print "	<li> $P: pcb-rnd plugin install dir (e.g. /usr/lib/pcb-rnd/)"
 		print "	<li> $C: pcb-rnd conf dir (e.g. /usr/share/pcb-rnd/)"
 		print "	<li> $LP: librnd plugin install dir (e.g. /usr/lib/librnd/)"
-		print "	<li> $LC: librnd conf dir (e.g. /usr/share/librnd/)"
+		print "	<li> $LC: librnd conf dir (e.g. /usr/share/librnd3/)"
 		print "	<li> $PREFIX: installation prefix (e.g. /usr)"
 		print "</ul>"
 
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 34858)
+++ trunk/src/Makefile.in	(revision 34859)
@@ -16,7 +16,7 @@
 then
 	put /local/pcb/librnd_extra_mak [@
 # static librd link: need to get all librnd ldlibs
-include $(LIBRND_PREFIX)/share/librnd/librnd.mak
+include $(LIBRND_PREFIX)/share/librnd3/librnd.mak
 @]
 	put /local/pcb/librnd_extra_ldlibs {$(LDFLAGS_LIBRND)}
 else
Index: trunk/util/bxl2txt/Makefile.in
===================================================================
--- trunk/util/bxl2txt/Makefile.in	(revision 34858)
+++ trunk/util/bxl2txt/Makefile.in	(revision 34859)
@@ -3,7 +3,7 @@
 ROOT=../..
 PLUGDIR=$(ROOT)/src_plugins
 LIBRND_LIBDIR=$(ROOT)/@/local/pcb/librnd_prefix@/lib/librnd
-LIBRND_SHAREDIR=$(ROOT)/@/local/pcb/librnd_prefix@/share/librnd
+LIBRND_SHAREDIR=$(ROOT)/@/local/pcb/librnd_prefix@/share/librnd3
 PLUG=$(PLUGDIR)/io_bxl
 CFLAGS = @/local/pcb/c89flags@ @/local/pcb/CFLAGS@ @?/local/pcb/librnd_extra_inc@ -I$(PLUG) -I$(ROOT) -I$(ROOT)/src -I$(ROOT)/src_3rd
 LDFLAGS = @/local/pcb/LDFLAGS@
Index: trunk/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- trunk/util/gsch2pcb-rnd/Makefile.in	(revision 34858)
+++ trunk/util/gsch2pcb-rnd/Makefile.in	(revision 34859)
@@ -9,7 +9,7 @@
 ROOT=../..
 PLUGDIR=../../src_plugins
 LIBRND_LIBDIR=@/local/pcb/librnd_prefix@/lib/librnd
-LIBRND_SHAREDIR=@/local/pcb/librnd_prefix@/share/librnd
+LIBRND_SHAREDIR=@/local/pcb/librnd_prefix@/share/librnd3
 GENCONF=$(LIBRND_LIBDIR)/librnd/scconfig/gen_conf.sh
 
 include $(LIBRND_SHAREDIR)/librnd.mak