Index: automake/cfa.m4
===================================================================
--- automake/cfa.m4	(revision 37fe3525f53534b29c07f4f1204c5f779836d193)
+++ automake/cfa.m4	(revision 0e0f128c9f975b8eb3f6b0870c12c639668ef24c)
@@ -26,5 +26,9 @@
 
 	if test "$libdir" = '${exec_prefix}/lib'; then
-		cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
+		if test "${ARCHITECTURE}" != ""; then
+			cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
+		else
+			cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
+		fi
 	else
 		cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"