From d607d715cabb4f16a8828e1265277efc7bb3ad73 Mon Sep 17 00:00:00 2001 From: zrj Date: Fri, 12 Apr 2019 16:03:44 +0300 Subject: [PATCH] PRIV: Add transitional handling in bsd.lib.mk. Allow certain versioned private libraries to be installed into public libraries directory. PRIVATELIB libraries already have mangled names. --- share/mk/bsd.lib.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index fbace0fc36..3e74cc2520 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -38,7 +38,11 @@ TARGET_SHLIBDIR?= ${SHLIBDIR} TARGET_LIBDIR?= ${LIBDIR}/priv TARGET_DEBUGLIBDIR?= ${DEBUGLIBDIR:S!/debug$!/priv/debug!} TARGET_PROFLIBDIR?= ${PROFLIBDIR:S!/profile$!/priv/profile!} +.if !emoty(PRIVATELIB) && ${PRIVATELIB} == "shpub" +TARGET_SHLIBDIR?= ${SHLIBDIR} +. else TARGET_SHLIBDIR?= ${SHLIBDIR}/priv +. endif .endif PRIVATELIB_CFLAGS?= -I${_SHLIBDIRPREFIX}/usr/include/priv -- 2.41.0