Index: Makefile
===================================================================
--- Makefile	(revision 33283)
+++ Makefile	(revision 33284)
@@ -84,7 +84,7 @@
 menucfg.o: menucfg.c
 	$(CC) -c $(CFLAGS) -o menucfg.o menucfg.c
 
-LIBRNDSCC=../src_3rd/librnd/scconfig
+LIBRNDSCC=../src_3rd/librnd-local/src/librnd/scconfig
 RNDHOOKS=$(LIBRNDSCC)/plugin_3state.h $(LIBRNDSCC)/hooks_common.h $(LIBRNDSCC)/hooks_gui.c $(LIBRNDSCC)/rnd_hook_detect.h
 hooks.o: hooks.c $(RNDHOOKS)  plugins.h Rev.h ../src_3rd/puplug/scconfig_hooks.h ../src_3rd/libfungw/scconfig_hooks.h ../src_3rd/libporty_net/hooks_net.c
 
Index: Rev.h
===================================================================
--- Rev.h	(revision 33283)
+++ Rev.h	(revision 33284)
@@ -1 +1 @@
-static const int myrev = 33267;
+static const int myrev = 33284;
Index: Rev.tab
===================================================================
--- Rev.tab	(revision 33283)
+++ Rev.tab	(revision 33284)
@@ -1,3 +1,4 @@
+33284	distclean	switch over to using librnd as a whole
 33267	configure	remove vtlibrary (footprint lib allocation simplification)
 33056	configure	menu item for feature plugins: asm and shape
 32952	configure	new plugin: ch_editpoint draw edit points of objects
Index: hooks.c
===================================================================
--- hooks.c	(revision 33283)
+++ hooks.c	(revision 33284)
@@ -13,16 +13,16 @@
 
 #define version "2.3.0"
 
-#define LIBRND_ROOT         "../src_3rd/librnd"
-#define LIBRND_PLUGIN_ROOT  "../src_3rd/librnd/plugins"
+#define LIBRND_ROOT         "../src_3rd/librnd-local/src/librnd"
+#define LIBRND_PLUGIN_ROOT  "../src_3rd/librnd-local/src/librnd/plugins"
 #include "../src_3rd/puplug/scconfig_hooks.h"
 #include "../src_3rd/libfungw/scconfig_hooks.h"
 #include "../src_3rd/libporty_net/hooks_net.c"
 
-#include "librnd/scconfig/plugin_3state.h"
-#include "librnd/scconfig/hooks_common.h"
-#include "librnd/scconfig/hooks_gui.c"
-#include "librnd/scconfig/rnd_hook_detect.h"
+#include "librnd-local/src/librnd/scconfig/plugin_3state.h"
+#include "librnd-local/src/librnd/scconfig/hooks_common.h"
+#include "librnd-local/src/librnd/scconfig/hooks_gui.c"
+#include "librnd-local/src/librnd/scconfig/rnd_hook_detect.h"
 
 const arg_auto_set_t disable_libs[] = { /* list of --disable-LIBs and the subtree they affect */
 	{"disable-gd",        "libs/gui/gd",                  arg_lib_nodes, "$do not use gd (many exporters need it)"},
@@ -111,8 +111,8 @@
 
 	rnd_calc_dialog_deps(); /* remove after librnd separation */
 
-	buildin = istrue(get("/target/librnd/dialogs/buildin"));
-	plugin = istrue(get("/target/librnd/dialogs/plugin"));
+	buildin = istrue(get("/target/librnd-local/src/librnd/dialogs/buildin"));
+	plugin = istrue(get("/target/librnd-local/src/librnd/dialogs/plugin"));
 
 	if (buildin) {
 		hook_custom_arg("buildin-draw_csect", NULL);