Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 37005)
+++ trunk/src/Makefile.in	(revision 37006)
@@ -15,14 +15,9 @@
 # static librd link: need to get all librnd ldlibs
 if /local/pcb/want_static_librnd
 then
-	put /local/pcb/librnd_extra_mak [@
-# static librd link: need to get all librnd ldlibs
-include $(LIBRND_PREFIX)/share/librnd4/librnd.mak
-@]
 	put /local/pcb/librnd_extra_ldlibs {$(LDFLAGS_LIBRND)}
 else
 	put /local/pcb/librnd_extra_ldlibs {}
-	put /local/pcb/librnd_extra_mak {}
 end
 
 if /local/pcb/want_static_librnd then
@@ -243,9 +238,8 @@
 
 # librnd installation
 LIBRND_PREFIX=@/local/pcb/librnd_prefix@
-@/local/pcb/librnd_extra_mak@
-LIBRND_LIBDIR=$(LIBRND_PREFIX)/@/local/libarchdir@/librnd4
-LIBRND_L=$(LIBRND_PREFIX)/@/local/libarchdir@
+include $(LIBRND_PREFIX)/share/librnd4/librnd.mak
+LIBRND_L=$(LIBRND_SODIR)
 LIBRND_PLUGDIR=$(LIBRND_LIBDIR)/plugins
 
 
Index: trunk/src_plugins/io_altium/parser_test/Makefile
===================================================================
--- trunk/src_plugins/io_altium/parser_test/Makefile	(revision 37005)
+++ trunk/src_plugins/io_altium/parser_test/Makefile	(revision 37006)
@@ -1,6 +1,6 @@
 include ../../../Makefile.conf
 include $(LIBRND_MAK)
-SPHASH=$(LIBRND_LIBDIR)/librnd3/sphash
+SPHASH=$(LIBRND_LIBDIR)/sphash
 CFLAGS = -Wall -g -I.. -I. $(CFLAGS_LIBRND)
 
 main: main.o pcbdoc_ascii.o ../altium_kw_sphash.o
@@ -13,4 +13,4 @@
 ../altium_kw_sphash.c ../altium_kw_sphash.h: ../altium_kw.sphash
 	$(SPHASH) $(VERBOSE) -i --multi --prefix altium_kw --out ../altium_kw < ../altium_kw_sphash.sphash
 
-altium_kw_sphash.o: ../altium_kw_sphash.c ../altium_kw_sphash.h
\ No newline at end of file
+altium_kw_sphash.o: ../altium_kw_sphash.c ../altium_kw_sphash.h
Index: trunk/util/bxl2txt/Makefile.in
===================================================================
--- trunk/util/bxl2txt/Makefile.in	(revision 37005)
+++ trunk/util/bxl2txt/Makefile.in	(revision 37006)
@@ -3,7 +3,6 @@
 ROOT=../..
 PLUGDIR=$(ROOT)/src_plugins
 LIBRND_INCDIR=@/local/pcb/librnd_prefix@/inlude/librnd4/librnd
-LIBRND_LIBDIR=@/local/pcb/librnd_prefix@/lib/librnd
 LIBRND_SHAREDIR=@/local/pcb/librnd_prefix@/share/librnd4
 PLUG=$(PLUGDIR)/io_bxl
 CFLAGS = @/local/pcb/c89flags@ @/local/pcb/CFLAGS@ @?/local/pcb/librnd_extra_inc@ -I$(PLUG) -I$(ROOT) -I$(ROOT)/src -I$(LIBRND_INCDIR) -I$(ROOT)/src_3rd
Index: trunk/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- trunk/util/gsch2pcb-rnd/Makefile.in	(revision 37005)
+++ trunk/util/gsch2pcb-rnd/Makefile.in	(revision 37006)
@@ -8,9 +8,8 @@
 print [@
 ROOT=../..
 PLUGDIR=../../src_plugins
-LIBRND_LIBDIR=@/local/pcb/librnd_prefix@/lib/librnd
 LIBRND_SHAREDIR=@/local/pcb/librnd_prefix@/share/librnd4
-GENCONF=$(LIBRND_LIBDIR)/librnd4/scconfig/gen_conf.sh
+GENCONF=$(LIBRND_LIBDIR)/scconfig/gen_conf.sh
 
 include $(LIBRND_SHAREDIR)/librnd.mak