diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 7e12fe6484a3..979483ba44e7 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20171104: libcap_random should be in /lib not in /usr/lib +OLD_LIBS+=usr/lib/libcap_random.so.0 # 20171104: Casper can work only as shared library OLD_FILES+=usr/lib/libcasper.a OLD_FILES+=usr/lib/libcasper_p.a diff --git a/lib/libcasper/libcasper/Makefile b/lib/libcasper/libcasper/Makefile index c1af1edd75cc..729bf071846a 100644 --- a/lib/libcasper/libcasper/Makefile +++ b/lib/libcasper/libcasper/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ +SHLIBDIR?= /lib + .include PACKAGE=${LIB} -SHLIB_MAJOR= 0 -SHLIBDIR?= /lib - .if ${MK_CASPER} != "no" SHLIB= casper +SHLIB_MAJOR= 0 SRCS= libcasper.c SRCS+= libcasper_impl.c diff --git a/lib/libcasper/services/cap_random/Makefile b/lib/libcasper/services/cap_random/Makefile index 45141d47bca8..fad8e3f9cdb7 100644 --- a/lib/libcasper/services/cap_random/Makefile +++ b/lib/libcasper/services/cap_random/Makefile @@ -1,11 +1,12 @@ # $FreeBSD$ +SHLIBDIR?= /lib/casper + .include PACKAGE=libcasper SHLIB_MAJOR= 0 -SHLIBDIR?= /lib/casper INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no"