Index: trunk/Makefile.conf.in
===================================================================
--- trunk/Makefile.conf.in	(revision 414)
+++ trunk/Makefile.conf.in	(revision 415)
@@ -1,10 +1,10 @@
 print [@# generated by ./configure, do not modify
 # prefix is @/local/prefix@
-DOCDIR=$(install_root)@/local/prefix@/share/doc/pcb
-LIBDIR=$(install_root)@/local/prefix@/lib/pcb
+DOCDIR=$(install_root)@/local/prefix@/share/doc/pcb-rnd
+LIBDIR=$(install_root)@/local/prefix@/lib/pcb-rnd
 BINDIR=$(install_root)@/local/prefix@/bin
 ETCDIR=$(install_root)/etc
-DATADIR=$(install_root)@/local/prefix@/share/pcb
+DATADIR=$(install_root)@/local/prefix@/share/pcb-rnd
 RM=@fstools/rm@
 CP=@fstools/cp@
 LN=@fstools/ln@
Index: trunk/config.auto.h.in
===================================================================
--- trunk/config.auto.h.in	(revision 414)
+++ trunk/config.auto.h.in	(revision 415)
@@ -289,7 +289,7 @@
 #define LIBRARYFILENAME "pcblib"
 
 #define PCB_PREFIX "@/local/prefix@"
-#define PCBLIBDIR PCB_PREFIX "/share/pcb"
+#define PCBLIBDIR PCB_PREFIX "/share/pcb-rnd"
 #define PCB_LIBRARY_SHELL NULL
 #define PCB_LIBRARY_SEARCH_PATHS \
 	"./pcblib"\
@@ -296,7 +296,7 @@
 	":" \
 	"./footprints"\
 	":" \
-	PCB_PREFIX  "/share/pcb/pcblib"\
+	PCB_PREFIX  "/share/pcb-rnd/pcblib"\
 	":"\
 	PCB_PREFIX  "/share/pcb/pcblib-newlib"
 
@@ -311,7 +311,7 @@
 #define BINDIR_TO_EXECPREFIX ".."
 
 /* Relative path from bindir to pcblibdir TODO: do we still need this? */
-#define BINDIR_TO_PCBLIBDIR "../share/pcb"
+#define BINDIR_TO_PCBLIBDIR "../share/pcb-rnd"
 
 @]
 
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 414)
+++ trunk/src/Makefile.in	(revision 415)
@@ -128,10 +128,10 @@
 LIBS=@/local/pcb/LIBS@ -lm -ldl
 HIDLIST=@/local/pcb/HIDS@
 
-all: pcb
+all: pcb-rnd
 
-pcb: $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -o pcb $(LIBS)
+pcb-rnd: $(OBJS)
+	$(CC) $(LDFLAGS) $(OBJS) -o pcb-rnd $(LIBS)
 @]
 
 # explicit rules: .y -> .c
@@ -250,7 +250,7 @@
 
 install_:
 	$(MKDIR) $(BINDIR) $(DATADIR)
-	$(CPC) `pwd`/pcb $(BINDIR)/pcb
+	$(CPC) `pwd`/pcb-rnd $(BINDIR)/pcb-rnd
 	$(CPC) `pwd`/default.pcb $(DATADIR)/default.pcb
 	$(CPC) `pwd`/default_font $(DATADIR)/default_font
 	$(CPC) `pwd`/gpcb-menu.res $(DATADIR)/gpcb-menu.res
@@ -263,7 +263,7 @@
 	make install_ CPC="$(LN)"
 
 uninstall:
-	$(RM) $(BINDIR)/pcb
+	$(RM) $(BINDIR)/pcb-rnd
 	$(RM) $(DATADIR)/default.pcb
 	$(RM) $(DATADIR)/default_font
 	$(RM) $(DATADIR)/gpcb-menu.res