js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix -soname.

Browse source
This commit is contained in:
Jonathan Schleifer 2007-10-21 02:32:31 +02:00
parent 4cdf2dde37
commit 1d86e48884
2 changed files with 59 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

40
buildsys.mk.in
View file

@ -201,32 +201,29 @@ install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${LIB}; do \ i=${LIB}; \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \ if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi \ fi
done
for i in ${STATIC_LIB}; do \ i=${STATIC_LIB}; \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \ if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi \ fi
done
for i in ${PLUGIN}; do \ i=${PLUGIN}; \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \ if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi \ fi
done
for i in ${DATA}; do \ for i in ${DATA}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
@ -237,14 +234,13 @@ install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra
fi \ fi \
done done
for i in ${PROG}; do \ i=${PROG}; \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
fi \ fi
done
for i in ${INCLUDES}; do \ for i in ${INCLUDES}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
@ -273,35 +269,32 @@ uninstall: uninstall-extra
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${LIB}; do \ i=${LIB}; \
if test -f ${DESTDIR}${libdir}/$$i; then \ if test -f ${DESTDIR}${libdir}/$$i; then \
if ${UNINSTALL_LIB}; then \ if ${UNINSTALL_LIB}; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi; \ fi
done
for i in ${STATIC_LIB}; do \ i=${STATIC_LIB}; \
if test -f ${DESTDIR}${libdir}/$$i; then \ if test -f ${DESTDIR}${libdir}/$$i; then \
if rm -f ${DESTDIR}${libdir}/$$i; then \ if rm -f ${DESTDIR}${libdir}/$$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi \ fi
done
for i in ${PLUGIN}; do \ i=${PLUGIN}; \
if test -f ${DESTDIR}${plugindir}/$$i; then \ if test -f ${DESTDIR}${plugindir}/$$i; then \
if rm -f ${DESTDIR}${plugindir}/$$i; then \ if rm -f ${DESTDIR}${plugindir}/$$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi \ fi
done
-rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1 -rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1
for i in ${DATA}; do \ for i in ${DATA}; do \
@ -314,15 +307,14 @@ uninstall: uninstall-extra
fi \ fi \
done done
for i in ${PROG}; do \ i=${PROG}; \
if test -f ${DESTDIR}${bindir}/$$i; then \ if test -f ${DESTDIR}${bindir}/$$i; then \
if rm -f ${DESTDIR}${bindir}/$$i; then \ if rm -f ${DESTDIR}${bindir}/$$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi \ fi
done
for i in ${INCLUDES}; do \ for i in ${INCLUDES}; do \
if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \

2
m4/buildsys.m4
View file

@ -104,7 +104,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
AC_MSG_RESULT(POSIX) AC_MSG_RESULT(POSIX)
LIB_CPPFLAGS='-DPIC' LIB_CPPFLAGS='-DPIC'
LIB_CFLAGS='-fPIC' LIB_CFLAGS='-fPIC'
LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}.0' LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}'
LIB_PREFIX='lib' LIB_PREFIX='lib'
LIB_SUFFIX='.so' LIB_SUFFIX='.so'
PLUGIN_CPPFLAGS='-DPIC' PLUGIN_CPPFLAGS='-DPIC'