Index: buildsys.mk.in
==================================================================
--- buildsys.mk.in
+++ buildsys.mk.in
@@ -199,36 +199,33 @@
 		${DIR_ENTER}; \
 		${MAKE} ${MFLAGS} install || exit 1; \
 		${DIR_LEAVE}; \
 	done
 
-	for i in ${LIB}; do \
-		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \
-			${INSTALL_OK}; \
-		else \
-			${INSTALL_FAILED}; \
-		fi \
-	done
-
-	for i in ${STATIC_LIB}; do \
-		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
-			${INSTALL_OK}; \
-		else \
-			${INSTALL_FAILED}; \
-		fi \
-	done
-
-	for i in ${PLUGIN}; do \
-		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \
-			${INSTALL_OK}; \
-		else \
-			${INSTALL_FAILED}; \
-		fi \
-	done
+	i=${LIB}; \
+	${INSTALL_STATUS}; \
+	if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \
+		${INSTALL_OK}; \
+	else \
+		${INSTALL_FAILED}; \
+	fi
+
+	i=${STATIC_LIB}; \
+	${INSTALL_STATUS}; \
+	if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
+		${INSTALL_OK}; \
+	else \
+		${INSTALL_FAILED}; \
+	fi
+
+	i=${PLUGIN}; \
+	${INSTALL_STATUS}; \
+	if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \
+		${INSTALL_OK}; \
+	else \
+		${INSTALL_FAILED}; \
+	fi
 
 	for i in ${DATA}; do \
 		${INSTALL_STATUS}; \
 		if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
 			${INSTALL_OK}; \
@@ -235,18 +232,17 @@
 		else \
 			${INSTALL_FAILED}; \
 		fi \
 	done
 
-	for i in ${PROG}; do \
-		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
-			${INSTALL_OK}; \
-		else \
-			${INSTALL_FAILED}; \
-		fi \
-	done
+	i=${PROG}; \
+	${INSTALL_STATUS}; \
+	if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
+		${INSTALL_OK}; \
+	else \
+		${INSTALL_FAILED}; \
+	fi
 
 	for i in ${INCLUDES}; do \
 		${INSTALL_STATUS}; \
 		if ${MKDIR_P} ${DESTDIR}${includedir}/${includesubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
 			${INSTALL_OK}; \
@@ -271,39 +267,36 @@
 		${DIR_ENTER}; \
 		${MAKE} ${MFLAGS} uninstall || exit 1; \
 		${DIR_LEAVE}; \
 	done
 
-	for i in ${LIB}; do \
-		if test -f ${DESTDIR}${libdir}/$$i; then \
-			if ${UNINSTALL_LIB}; then \
-				${DELETE_OK}; \
-			else \
-				${DELETE_FAILED}; \
-			fi \
-		fi; \
-	done
-
-	for i in ${STATIC_LIB}; do \
-		if test -f ${DESTDIR}${libdir}/$$i; then \
-			if rm -f ${DESTDIR}${libdir}/$$i; then \
-				${DELETE_OK}; \
-			else \
-				${DELETE_FAILED}; \
-			fi \
-		fi \
-	done
-
-	for i in ${PLUGIN}; do \
-		if test -f ${DESTDIR}${plugindir}/$$i; then \
-			if rm -f ${DESTDIR}${plugindir}/$$i; then \
-				${DELETE_OK}; \
-			else \
-				${DELETE_FAILED}; \
-			fi \
-		fi \
-	done
+	i=${LIB}; \
+	if test -f ${DESTDIR}${libdir}/$$i; then \
+		if ${UNINSTALL_LIB}; then \
+			${DELETE_OK}; \
+		else \
+			${DELETE_FAILED}; \
+		fi \
+	fi
+
+	i=${STATIC_LIB}; \
+	if test -f ${DESTDIR}${libdir}/$$i; then \
+		if rm -f ${DESTDIR}${libdir}/$$i; then \
+			${DELETE_OK}; \
+		else \
+			${DELETE_FAILED}; \
+		fi \
+	fi
+
+	i=${PLUGIN}; \
+	if test -f ${DESTDIR}${plugindir}/$$i; then \
+		if rm -f ${DESTDIR}${plugindir}/$$i; then \
+			${DELETE_OK}; \
+		else \
+			${DELETE_FAILED}; \
+		fi \
+	fi
 	-rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1
 
 	for i in ${DATA}; do \
 		if test -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
 			if rm -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
@@ -312,19 +305,18 @@
 				${DELETE_FAILED}; \
 			fi \
 		fi \
 	done
 
-	for i in ${PROG}; do \
-		if test -f ${DESTDIR}${bindir}/$$i; then \
-			if rm -f ${DESTDIR}${bindir}/$$i; then \
-				${DELETE_OK}; \
-			else \
-				${DELETE_FAILED}; \
-			fi \
-		fi \
-	done
+	i=${PROG}; \
+	if test -f ${DESTDIR}${bindir}/$$i; then \
+		if rm -f ${DESTDIR}${bindir}/$$i; then \
+			${DELETE_OK}; \
+		else \
+			${DELETE_FAILED}; \
+		fi \
+	fi
 
 	for i in ${INCLUDES}; do \
 		if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
 			if rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
 				${DELETE_OK}; \

Index: m4/buildsys.m4
==================================================================
--- m4/buildsys.m4
+++ m4/buildsys.m4
@@ -102,11 +102,11 @@
 			;;
 		*)
 			AC_MSG_RESULT(POSIX)
 			LIB_CPPFLAGS='-DPIC'
 			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_SUFFIX='.so'
 			PLUGIN_CPPFLAGS='-DPIC'
 			PLUGIN_CFLAGS='-fPIC'
 			PLUGIN_LDFLAGS='-shared -fPIC'