emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop shlibdir

Browse Source 
I know of no other build systems that have separate paths for static vs
shared libraries, so this changes ours to use libdir for all libraries.
This commit is contained in:
William Hubbs 2021-03-21 17:19:56 -05:00
parent 1878a74a12
commit 5058b6668c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mk/lib.mk
View File

@ -52,13 +52,12 @@ ${SHLIB_NAME}: ${SOBJS}
${SOBJS} ${LDADD} ${SOBJS} ${LDADD}
install: all install: all
ifeq (${MKSTATICLIBS},yes)
${INSTALL} -d ${DESTDIR}${LIBDIR} ${INSTALL} -d ${DESTDIR}${LIBDIR}
ifeq (${MKSTATICLIBS},yes)
${INSTALL} -m ${LIBMODE} lib${LIB}.a ${DESTDIR}${LIBDIR} ${INSTALL} -m ${LIBMODE} lib${LIB}.a ${DESTDIR}${LIBDIR}
endif endif
${INSTALL} -d ${DESTDIR}${SHLIBDIR} ${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}
${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
${INSTALL} -d ${DESTDIR}${INCDIR} ${INSTALL} -d ${DESTDIR}${INCDIR}
for x in ${INCS}; do ${INSTALL} -m ${INCMODE} $$x ${DESTDIR}${INCDIR}; done for x in ${INCS}; do ${INSTALL} -m ${INCMODE} $$x ${DESTDIR}${INCDIR}; done

1
mk/sys.mk
View File

@ -52,7 +52,6 @@ _LIBNAME:= $(shell ${_LIBNAME_SH})
LIBNAME?= ${_LIBNAME} LIBNAME?= ${_LIBNAME}
LIBDIR?= ${UPREFIX}/${LIBNAME} LIBDIR?= ${UPREFIX}/${LIBNAME}
LIBMODE?= 0644 LIBMODE?= 0644
SHLIBDIR?= ${PREFIX}/${LIBNAME}
LIBEXECDIR?= ${PREFIX}/libexec/rc LIBEXECDIR?= ${PREFIX}/libexec/rc