When creating .so symlinks, use SHLIBDIR instead of LIBDIR so symlinks
are created in the correct location. Always make them. For libraries that live in /lib, this causes a /lib/libfoo.so and a compatibility /usr/lib/libfoo.so to be created. We may want to drop the /usr/lib/libfoo.so symlink at some future point.
This commit is contained in:
parent
cdcca2ab04
commit
61c5e684cc
@ -206,9 +206,8 @@ _libinstall:
|
|||||||
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
|
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
|
||||||
${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
|
${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
|
||||||
.if defined(SHLIB_LINK)
|
.if defined(SHLIB_LINK)
|
||||||
.if (${LIBDIR} == ${SHLIBDIR})
|
ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
|
||||||
ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
|
.if (${LIBDIR} != ${SHLIBDIR})
|
||||||
.else
|
|
||||||
ln -fs ${LIBDIR:C|/[^/]+|/..|g:S|^/||}${SHLIBDIR}/${SHLIB_NAME} \
|
ln -fs ${LIBDIR:C|/[^/]+|/..|g:S|^/||}${SHLIBDIR}/${SHLIB_NAME} \
|
||||||
${DESTDIR}${LIBDIR}/${SHLIB_LINK}
|
${DESTDIR}${LIBDIR}/${SHLIB_LINK}
|
||||||
.endif
|
.endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user