Index: work/OS/debian/librnd-dev.install
===================================================================
--- work/OS/debian/librnd-dev.install	(revision 33478)
+++ work/OS/debian/librnd-dev.install	(revision 33479)
@@ -2,5 +2,5 @@
 /usr/share/librnd/librnd.mak
 /usr/lib/librnd
 /usr/lib/*.so
-/usr/lib/librnd/gen_conf
+/usr/lib/librnd/scconfig/gen_conf.sh
 /usr/lib/librnd/puplug
Index: work/OS/debian/pcb-rnd-cloud.install
===================================================================
--- work/OS/debian/pcb-rnd-cloud.install	(revision 33478)
+++ work/OS/debian/pcb-rnd-cloud.install	(revision 33479)
@@ -1,5 +1,5 @@
 /usr/lib/pcb-rnd/plugins/fp_wget.pup
 /usr/lib/pcb-rnd/plugins/fp_wget.so
-/usr/lib/pcb-rnd/plugins/lib_wget.pup
-/usr/lib/pcb-rnd/plugins/lib_wget.so
+/usr/lib/librnd/plugins/lib_wget.pup
+/usr/lib/librnd/plugins/lib_wget.so
 /etc/pcb-rnd/fp_wget.conf
Index: work/OS/debian/pcb-rnd-hid-gtk2-gdk.install
===================================================================
--- work/OS/debian/pcb-rnd-hid-gtk2-gdk.install	(revision 33478)
+++ work/OS/debian/pcb-rnd-hid-gtk2-gdk.install	(revision 33479)
@@ -1,2 +1,2 @@
-/usr/lib/pcb-rnd/plugins/hid_gtk2_gdk.pup
-/usr/lib/pcb-rnd/plugins/hid_gtk2_gdk.so
+/usr/lib/librnd/plugins/hid_gtk2_gdk.pup
+/usr/lib/librnd/plugins/hid_gtk2_gdk.so
Index: work/OS/debian/pcb-rnd-hid-gtk2-gl.install
===================================================================
--- work/OS/debian/pcb-rnd-hid-gtk2-gl.install	(revision 33478)
+++ work/OS/debian/pcb-rnd-hid-gtk2-gl.install	(revision 33479)
@@ -1,2 +1,2 @@
-/usr/lib/pcb-rnd/plugins/hid_gtk2_gl.pup
-/usr/lib/pcb-rnd/plugins/hid_gtk2_gl.so
+/usr/lib/librnd/plugins/hid_gtk2_gl.pup
+/usr/lib/librnd/plugins/hid_gtk2_gl.so
Index: work/OS/debian/pcb-rnd-hid-lesstif.install
===================================================================
--- work/OS/debian/pcb-rnd-hid-lesstif.install	(revision 33478)
+++ work/OS/debian/pcb-rnd-hid-lesstif.install	(revision 33479)
@@ -1,2 +1,2 @@
-/usr/lib/pcb-rnd/plugins/hid_lesstif.pup
-/usr/lib/pcb-rnd/plugins/hid_lesstif.so
+/usr/lib/librnd/plugins/hid_lesstif.pup
+/usr/lib/librnd/plugins/hid_lesstif.so
Index: work/OS/debian/pcb-rnd-lib-gl.install
===================================================================
--- work/OS/debian/pcb-rnd-lib-gl.install	(revision 33478)
+++ work/OS/debian/pcb-rnd-lib-gl.install	(revision 33479)
@@ -1,2 +1,2 @@
-/usr/lib/pcb-rnd/plugins/lib_hid_gl.pup
-/usr/lib/pcb-rnd/plugins/lib_hid_gl.so
+/usr/lib/librnd/plugins/lib_hid_gl.pup
+/usr/lib/librnd/plugins/lib_hid_gl.so
Index: work/OS/debian/pcb-rnd-lib-gtk.install
===================================================================
--- work/OS/debian/pcb-rnd-lib-gtk.install	(revision 33478)
+++ work/OS/debian/pcb-rnd-lib-gtk.install	(revision 33479)
@@ -1,2 +1,2 @@
-/usr/lib/pcb-rnd/plugins/lib_gtk_common.pup
-/usr/lib/pcb-rnd/plugins/lib_gtk_common.so
+/usr/lib/librnd/plugins/lib_gtk_common.pup
+/usr/lib/librnd/plugins/lib_gtk_common.so
Index: work/OS/debian/pcb-rnd-lib-gui.install
===================================================================
--- work/OS/debian/pcb-rnd-lib-gui.install	(revision 33478)
+++ work/OS/debian/pcb-rnd-lib-gui.install	(revision 33479)
@@ -4,8 +4,9 @@
 /usr/lib/pcb-rnd/plugins/draw_fontsel.so
 /usr/lib/pcb-rnd/plugins/lib_hid_pcbui.pup
 /usr/lib/pcb-rnd/plugins/lib_hid_pcbui.so
-/usr/lib/pcb-rnd/plugins/irc.pup
-/usr/lib/pcb-rnd/plugins/irc.so
-/usr/lib/pcb-rnd/plugins/lib_hid_common.pup
-/usr/lib/pcb-rnd/plugins/lib_hid_common.so
+/usr/lib/librnd/plugins/irc.pup
+/usr/lib/librnd/plugins/irc.so
+/usr/lib/librnd/plugins/lib_hid_common.pup
+/usr/lib/librnd/plugins/lib_hid_common.so
+/etc/pcb-rnd/adialogs.conf
 /etc/pcb-rnd/dialogs.conf
Index: work/OS/debian/pcb-rnd-lib-io.install
===================================================================
--- work/OS/debian/pcb-rnd-lib-io.install	(revision 33478)
+++ work/OS/debian/pcb-rnd-lib-io.install	(revision 33479)
@@ -1,4 +1,4 @@
 /usr/lib/pcb-rnd/plugins/lib_netmap.pup
 /usr/lib/pcb-rnd/plugins/lib_netmap.so
-/usr/lib/pcb-rnd/plugins/lib_gensexpr.pup
-/usr/lib/pcb-rnd/plugins/lib_gensexpr.so
+/usr/lib/librnd/plugins/lib_gensexpr.pup
+/usr/lib/librnd/plugins/lib_gensexpr.so
Index: work/OS/debian_gen/gen.sh
===================================================================
--- work/OS/debian_gen/gen.sh	(revision 33478)
+++ work/OS/debian_gen/gen.sh	(revision 33479)
@@ -17,6 +17,8 @@
 PREFIX=/usr
 PLUGDIR=$PREFIX/lib/pcb-rnd/plugins
 CONFDIR=/etc/pcb-rnd
+LIBPLUGDIR=$PREFIX/lib/librnd/plugins
+LIBCONFDIR=/etc/pcb-rnd
 
 # data not coming from $auto
 SUGGESTS["pcb-rnd"]="geda-gnetlist"
@@ -119,6 +121,8 @@
 		s@[$]PREFIX@'$PREFIX'@g;
 		s@[$]C@'$CONFDIR'@g;
 		s@[$]P@'$PLUGDIR'@g;
+		s@[$]LC@'$LIBCONFDIR'@g;
+		s@[$]LP@'$LIBPLUGDIR'@g;
 		s@ @\n@g;
 	' < $auto/$pkg.files
 }