svn commit: r289140 - projects/release-pkg/share/mk
Baptiste Daroussin
bapt at FreeBSD.org
Sun Oct 11 15:39:38 UTC 2015
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})
More information about the svn-src-projects
mailing list