aboutsummaryrefslogtreecommitdiff
path: root/mk/lib.mk
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2021-03-21 17:19:56 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2021-03-21 17:20:25 -0500
commit5058b6668caaa1ac019d6da299528ad0c75379c2 (patch)
tree993e411e27a53c188bcf4bed522ba3c7bb95dc4d /mk/lib.mk
parent1878a74a124e12fbdc3fe3286d81045b9198d424 (diff)
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.
Diffstat (limited to 'mk/lib.mk')
-rw-r--r--mk/lib.mk7
1 files changed, 3 insertions, 4 deletions
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