Date: Sun, 11 Oct 2015 15:39:37 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r289140 - projects/release-pkg/share/mk Message-ID: <201510111539.t9BFdbsn089209@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Oct 11 15:39:37 2015 New Revision: 289140 URL: https://svnweb.freebsd.org/changeset/base/289140 Log: Fix bad merge Modified: projects/release-pkg/share/mk/bsd.lib.mk Modified: projects/release-pkg/share/mk/bsd.lib.mk ============================================================================== --- projects/release-pkg/share/mk/bsd.lib.mk Sun Oct 11 15:11:53 2015 (r289139) +++ projects/release-pkg/share/mk/bsd.lib.mk Sun Oct 11 15:39:37 2015 (r289140) @@ -383,9 +383,10 @@ _libinstall: .endif .else .if ${SHLIB_LINK:Mlib*} - ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/${SHLIB_LINK} + ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ + ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} .else - ${INSTALL_RSYMLINK} ${TAG_ARGS} ${_SHLIBDIRPREFIX}${_SHLIBDIR}/${SHLIB_NAME} \ + ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} .endif .if exists(${DESTDIR}${_LIBDIR}/${SHLIB_NAME})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510111539.t9BFdbsn089209>