diff options
| author | jlh <jlh@FreeBSD.org> | 2013-06-16 16:29:23 +0000 |
|---|---|---|
| committer | jlh <jlh@FreeBSD.org> | 2013-06-16 16:29:23 +0000 |
| commit | 36ff9e64373f542713bdd4f7074446cdbf243bd0 (patch) | |
| tree | e10dca9430a28f53e372fea6261af8e15faa8612 /share/mk | |
| parent | 5cf909a854b7bc035f981644b2d917685474e997 (diff) | |
| download | FreeBSD-src-36ff9e64373f542713bdd4f7074446cdbf243bd0.zip FreeBSD-src-36ff9e64373f542713bdd4f7074446cdbf243bd0.tar.gz | |
Fix install from read-only obj dir when SHLIB_LDSCRIPT is used.
Reported by: joeld
Tested by: joeld
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.lib.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 3edb5bc..66d0a29 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -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} |
