Index: trunk/doc/Makefile
===================================================================
--- trunk/doc/Makefile	(revision 304)
+++ trunk/doc/Makefile	(revision 305)
@@ -2,6 +2,7 @@
 KEYLIST=../util/keylist.sh
 DEBLIST=../util/devhelpers/deblist.sh
 ROOT=..
+LIBARCHDIR=lib
 
 all: user/keys.html user/keytree.svg user/keytree.txt
 	ROOT="" ./Autostyle.sh *.html
@@ -8,7 +9,7 @@
 
 include ../Makefile.conf
 
-SCCBOX = $(LIBRND_PREFIX)/lib/librnd3/scconfig/sccbox
+SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox
 
 user/keytree.svg: $(MENU_RES) $(KEYLIST)
 	$(KEYLIST) --dot user/node_names.txt $(MENU_RES) > user/keytree.dot
Index: trunk/doc/developer/Makefile
===================================================================
--- trunk/doc/developer/Makefile	(revision 304)
+++ trunk/doc/developer/Makefile	(revision 305)
@@ -1,5 +1,6 @@
 include ../../Makefile.conf
-SCCBOX = $(LIBRND_PREFIX)/lib/librnd3/scconfig/sccbox
+LIBARCHDIR=lib
+SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox
 
 all:
 
Index: trunk/doc/man/Makefile
===================================================================
--- trunk/doc/man/Makefile	(revision 304)
+++ trunk/doc/man/Makefile	(revision 305)
@@ -4,7 +4,8 @@
 
 include $(ROOT)/Makefile.conf
 MAN1DIR=$(SHAREDIR)/man/man1
-SCCBOX = $(LIBRND_PREFIX)/lib/librnd3/scconfig/sccbox
+LIBARCHDIR=lib
+SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox
 
 IN=camv-rnd.1.mml
 OUT_HTML = camv-rnd.1.html
Index: trunk/doc/user/Makefile
===================================================================
--- trunk/doc/user/Makefile	(revision 304)
+++ trunk/doc/user/Makefile	(revision 305)
@@ -1,5 +1,6 @@
 include ../../Makefile.conf
-SCCBOX = $(LIBRND_PREFIX)/lib/librnd3/scconfig/sccbox
+LIBARCHDIR=lib
+SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox
 
 all:
 
Index: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	(revision 304)
+++ trunk/src/Makefile	(revision 305)
@@ -45,7 +45,7 @@
 	cd gcode && byacc -v -b gcode -d -p gcode -P gcode.y
 
 conf_core_fields.h: conf_core.h
-	$(LIBRND_PREFIX)/lib/librnd3/scconfig/gen_conf.sh  < conf_core.h > conf_core_fields.h
+	$(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/gen_conf.sh  < conf_core.h > conf_core_fields.h
 
 buildin.c: $(PLGD)/.builtin.pups $(PUPLUG)
 	cd $(PLGD) && $(PUPLUG) buildin.c "-" < $(PLGD)/.builtin.pups > ../src/buildin.c
Index: trunk/src_plugins/import_gcode/Makefile
===================================================================
--- trunk/src_plugins/import_gcode/Makefile	(revision 304)
+++ trunk/src_plugins/import_gcode/Makefile	(revision 305)
@@ -1,6 +1,7 @@
 include ../../Makefile.conf
+LIBARCHDIR=lib
 CFLAGS = -DRND_PCB_COMPAT -Wall -g -I$(LIBRND_PREFIX)/include/librnd/src_3rd
-LDLIBS = -lm $(LIBRND_PREFIX)/lib/librnd-3rd.a
+LDLIBS = -lm $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd-3rd.a
 
 main: main.o gcode_vm.o gcode_exec.o gcode_lex.o gcode.tab.o