Index: trunk/scconfig/Rev.h
===================================================================
--- trunk/scconfig/Rev.h	(revision 31040)
+++ trunk/scconfig/Rev.h	(revision 31041)
@@ -1 +1 @@
-static const int myrev = 31020;
+static const int myrev = 31041;
Index: trunk/scconfig/Rev.tab
===================================================================
--- trunk/scconfig/Rev.tab	(revision 31040)
+++ trunk/scconfig/Rev.tab	(revision 31041)
@@ -1,4 +1,4 @@
-31020	configure	pcb_ -> rnd_ renames in librnd
+31041	configure	pcb_ -> rnd_ renames in librnd
 30779	configure	remove distaligntext - all cases handled by distalign properly
 30754	configure	remove the old import_sch plugin (in favor of import_sch2)
 30753	configure	disable the old drc, enable the new drc
Index: trunk/src/librnd/config.h.in
===================================================================
--- trunk/src/librnd/config.h.in	(revision 31040)
+++ trunk/src/librnd/config.h.in	(revision 31041)
@@ -190,7 +190,7 @@
 
 /* Format: abccrrrrr where a, b and c are pcb-rnd version numbers and r is
    the svn revision number (optional) */
-#define PCB_API_VER @/local/apiver@
+#define RND_API_VER @/local/apiver@
 
 @?/local/pcb/include_stdint@
 
Index: trunk/src/librnd/core/plugins.c
===================================================================
--- trunk/src/librnd/core/plugins.c	(revision 31040)
+++ trunk/src/librnd/core/plugins.c	(revision 31041)
@@ -34,7 +34,7 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/actions.h>
 
-unsigned long rnd_api_ver = PCB_API_VER;
+unsigned long rnd_api_ver = RND_API_VER;
 
 pup_context_t rnd_pup;
 char **rnd_pup_paths = NULL;
Index: trunk/src/librnd/core/plugins.h
===================================================================
--- trunk/src/librnd/core/plugins.h	(revision 31040)
+++ trunk/src/librnd/core/plugins.h	(revision 31041)
@@ -33,11 +33,11 @@
 /* core's version stored in plugins.o */
 extern unsigned long rnd_api_ver;
 
-#define RND_API_VER_MATCH (PCB_API_VER == rnd_api_ver)
+#define RND_API_VER_MATCH (RND_API_VER == rnd_api_ver)
 #define RND_API_CHK_VER \
 do { \
 	if (!RND_API_VER_MATCH) {\
-		fprintf(stderr, "pcb-rnd API version incompatibility: " __FILE__ "=%lu core=%lu\n(not loading this plugin)\n", (unsigned long)PCB_API_VER, rnd_api_ver); \
+		fprintf(stderr, "librnd API version incompatibility: " __FILE__ "=%lu core=%lu\n(not loading this plugin)\n", (unsigned long)RND_API_VER, rnd_api_ver); \
 		return 1; \
 	} \
 } while(0)
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 31040)
+++ trunk/src/librnd/pcb_compat.h	(revision 31041)
@@ -1320,3 +1320,4 @@
 #define pcb_r_first rnd_r_first
 #define pcb_r_next rnd_r_next
 #define pcb_r_end rnd_r_end
+#define PCB_API_VER RND_API_VER