diff --git a/mk/lib.mk b/mk/lib.mk index efd9ea85..290bf915 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -52,13 +52,12 @@ ${SHLIB_NAME}: ${SOBJS} ${SOBJS} ${LDADD} install: all -ifeq (${MKSTATICLIBS},yes) ${INSTALL} -d ${DESTDIR}${LIBDIR} +ifeq (${MKSTATICLIBS},yes) ${INSTALL} -m ${LIBMODE} lib${LIB}.a ${DESTDIR}${LIBDIR} endif - ${INSTALL} -d ${DESTDIR}${SHLIBDIR} - ${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} - ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK} + ${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${LIBDIR} + ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK} ${INSTALL} -d ${DESTDIR}${INCDIR} for x in ${INCS}; do ${INSTALL} -m ${INCMODE} $$x ${DESTDIR}${INCDIR}; done diff --git a/mk/sys.mk b/mk/sys.mk index 92bb55ea..40d1367b 100644 --- a/mk/sys.mk +++ b/mk/sys.mk @@ -52,7 +52,6 @@ _LIBNAME:= $(shell ${_LIBNAME_SH}) LIBNAME?= ${_LIBNAME} LIBDIR?= ${UPREFIX}/${LIBNAME} LIBMODE?= 0644 -SHLIBDIR?= ${PREFIX}/${LIBNAME} LIBEXECDIR?= ${PREFIX}/libexec/rc