Index: trunk/Makefile.conf.in =================================================================== --- trunk/Makefile.conf.in (revision 34513) +++ trunk/Makefile.conf.in (revision 34514) @@ -34,7 +34,7 @@ # hidlib installation directories HL_LIBDIR=$(Install_root)@/local/prefix@/@/local/libarchdir@ HL_SHAREDIR=$(Install_root)@/local/prefix@/share/librnd4 -HL_INCDIR=$(Install_root)@/local/prefix@/include/librnd +HL_INCDIR=$(Install_root)@/local/prefix@/include/librnd4/librnd # used for tests LIBRND_RDYNAMIC=@cc/rdynamic@ Index: trunk/doc/developer/packaging/extra.digest =================================================================== --- trunk/doc/developer/packaging/extra.digest (revision 34513) +++ trunk/doc/developer/packaging/extra.digest (revision 34514) @@ -1,4 +1,4 @@ -@files librnd4-dev $PREFIX/include/librnd/* +@files librnd4-dev $PREFIX/include/librnd4/librnd/* @files librnd4 $PREFIX/lib/*.so.* @appendfiles librnd4-dev $PREFIX/share/librnd4/librnd.mak @appendfiles librnd4-dev $PREFIX/share/librnd4/plugin.state Index: trunk/tests/librnd/Makefile =================================================================== --- trunk/tests/librnd/Makefile (revision 34513) +++ trunk/tests/librnd/Makefile (revision 34514) @@ -6,7 +6,7 @@ include $(TRUNK)/src/librnd/core/librnd.mak -CFLAGS = -I$(LIBRND_ROOT)/include -I$(LIBRND_ROOT)/include/librnd/src_3rd $(PCB_RND_C89FLAGS) $(CFLAGS_LIBRND) +CFLAGS = -I$(LIBRND_ROOT)/include/librnd4 -I$(LIBRND_ROOT)/include/librnd4/librnd/src_3rd $(PCB_RND_C89FLAGS) $(CFLAGS_LIBRND) LDFLAGS = $(LIBRND_RDYNAMIC) $(LDFLAGS_LIBRND) LIBRND_A = include/$(HL_LIBDIR)/librnd-poly.a include/$(HL_LIBDIR)/librnd-hid.a include/$(HL_LIBDIR)/librnd-3rd.a