Index: trunk/config.sh.in =================================================================== --- trunk/config.sh.in (revision 696) +++ trunk/config.sh.in (revision 697) @@ -1,6 +1,6 @@ print [@ # *** Autogenerated by scconfig *** DO NOT EDIT *** # camv-rnd config for shell scripts -librnd_root=@libs/sul/librnd-3rd/root@ +librnd_root=@/local/camv/librnd_prefix@ librnd_libdir=$librnd_root/lib/librnd4 @] Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 696) +++ trunk/scconfig/Rev.h (revision 697) @@ -1 +1 @@ -static const int myrev = 678; +static const int myrev = 697; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 696) +++ trunk/scconfig/Rev.tab (revision 697) @@ -1,3 +1,4 @@ +697 configure ./configure shouldn't detect librnd as it depends on librnd 678 configure link against librnd-font 611 configure BINDIR in config.h 589 configure move import_gcode config into the plugin Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 696) +++ trunk/scconfig/hooks.c (revision 697) @@ -146,7 +146,6 @@ require("sys/types/size/4_u_int", 0, 1); - require("libs/sul/librnd-hid/*", 0, 1); require("libs/sul/freetype2/*", 0, 1); /* byaccic - are we able to regenerate languages? */ Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 696) +++ trunk/src/Makefile.in (revision 697) @@ -84,12 +84,10 @@ ### Makefile ### print [@ -LIBRND_ROOT=@libs/sul/librnd-3rd/root@ -include @libs/sul/librnd-3rd/mak@ +ROOT=@/local/camv/root@ +include $(ROOT)/Makefile.conf - RNDLIB_LDLIBS = -lrnd-hid -lrnd-poly -lrnd-font -lrnd-core -lrnd-3rd -ROOT=@/local/camv/root@ CC=@cc/cc@ CFLAGS=@/local/camv/CFLAGS@ @?/local/rnd/CFLAGS@ $(CFLAGS_LIBRND) @libs/sul/freetype2/cflags@ C89FLAGS=$(CFLAGS)