Index: trunk/doc/Makefile
===================================================================
--- trunk/doc/Makefile	(revision 340)
+++ trunk/doc/Makefile	(revision 341)
@@ -2,7 +2,7 @@
 KEYLIST=../util/keylist.sh
 DEBLIST=../util/devhelpers/deblist.sh
 ROOT=..
-LIBARCHDIR=lib
+LIBARCHDIR=$(LIBRND_LIBARCHDIR)
 
 all: user/keys.html user/keytree.svg user/keytree.txt
 	ROOT="" ./Autostyle.sh *.html
Index: trunk/doc/developer/Makefile
===================================================================
--- trunk/doc/developer/Makefile	(revision 340)
+++ trunk/doc/developer/Makefile	(revision 341)
@@ -1,5 +1,5 @@
 include ../../Makefile.conf
-LIBARCHDIR=lib
+LIBARCHDIR=$(LIBRND_LIBARCHDIR)
 SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox
 
 all:
Index: trunk/doc/man/Makefile
===================================================================
--- trunk/doc/man/Makefile	(revision 340)
+++ trunk/doc/man/Makefile	(revision 341)
@@ -4,7 +4,7 @@
 
 include $(ROOT)/Makefile.conf
 MAN1DIR=$(SHAREDIR)/man/man1
-LIBARCHDIR=lib
+LIBARCHDIR=$(LIBRND_LIBARCHDIR)
 SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox
 
 IN=camv-rnd.1.mml
Index: trunk/doc/user/Makefile
===================================================================
--- trunk/doc/user/Makefile	(revision 340)
+++ trunk/doc/user/Makefile	(revision 341)
@@ -1,5 +1,5 @@
 include ../../Makefile.conf
-LIBARCHDIR=lib
+LIBARCHDIR=$(LIBRND_LIBARCHDIR)
 SCCBOX = $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd3/scconfig/sccbox
 
 all:
Index: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	(revision 340)
+++ trunk/src/Makefile	(revision 341)
@@ -3,7 +3,7 @@
 
 PLGD=../src_plugins
 THIRD=../src_3rd
-LIBARCHDIR=lib
+LIBARCHDIR=$(LIBRND_LIBARCHDIR)
 
 CFLAGS = -Wall -g -I. -I$(THIRD) $(CFLAGS_LIBRND) `pkg-config --cflags freetype2` $(CFG_CFLAGS)
 LDFLAGS = -rdynamic `pkg-config --libs freetype2` $(CFG_LDFLAGS)
Index: trunk/src_plugins/import_gcode/Makefile
===================================================================
--- trunk/src_plugins/import_gcode/Makefile	(revision 340)
+++ trunk/src_plugins/import_gcode/Makefile	(revision 341)
@@ -1,5 +1,5 @@
 include ../../Makefile.conf
-LIBARCHDIR=lib
+LIBARCHDIR=$(LIBRND_LIBARCHDIR)
 CFLAGS = -DRND_PCB_COMPAT -Wall -g -I$(LIBRND_PREFIX)/include/librnd/src_3rd
 LDLIBS = -lm $(LIBRND_PREFIX)/$(LIBARCHDIR)/librnd-3rd.a