From 5058b6668caaa1ac019d6da299528ad0c75379c2 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sun, 21 Mar 2021 17:19:56 -0500 Subject: drop shlibdir 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. --- mk/lib.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mk/lib.mk') 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 -- cgit v1.2.3