Author: jlh
Date: Sun Jun 16 16:29:23 2013
New Revision: 251810
URL: http://svnweb.freebsd.org/changeset/base/251810
Log:
Fix install from read-only obj dir when SHLIB_LDSCRIPT is used.
Reported by: joeld
Tested by: joeld
Modified:
head/share/mk/bsd.lib.mk
Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk Sun Jun 16 16:10:45 2013 (r251809)
+++ head/share/mk/bsd.lib.mk Sun Jun 16 16:29:23 2013 (r251810)
@@ -330,9 +330,12 @@ _libinstall:
.if defined(SHLIB_LDSCRIPT) && !empty(SHLIB_LDSCRIPT) &&
exists(${.CURDIR}/${SHLIB_LDSCRIPT})
sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${SHLIBDIR}/${SHLIB_NAME},g' \
-e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${LIBDIR},g' \
- ${.CURDIR}/${SHLIB_LDSCRIPT} > lib${LIB}.ld
+ ${.CURDIR}/${SHLIB_LDSCRIPT} >
${DESTDIR}${LIBDIR}/${SHLIB_LINK:R}.ld
${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.ld ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+ ${_INSTALLFLAGS} ${DESTDIR}${LIBDIR}/${SHLIB_LINK:R}.ld \
+ ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+ rm -f ${DESTDIR}${LIBDIR}/${SHLIB_LINK:R}.ld
+
.else
.if ${SHLIBDIR} == ${LIBDIR}
${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
