Index: configure
===================================================================
--- configure	(revision 37fe3525f53534b29c07f4f1204c5f779836d193)
+++ configure	(revision a5121bff2d239413034fc4cc466f9e5b15eebd1b)
@@ -3266,5 +3266,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}"
@@ -3450,14 +3454,14 @@
 
 	lib_arch=${cannon_arch_name}
-	lib_dir="libcfa-${lib_arch}-${lib_config}"
+	lib_dir="libcfa/${lib_arch}-${lib_config}"
 
 	LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
 	LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
 
-	mkdir -p libcfa-${lib_arch}-${lib_config}
-	echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data
-	echo -n "${LIBCFA_PATHS} " >> libcfa-${lib_arch}-${lib_config}/config.data
-	echo -n "ARCHITECTURE=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
-	echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data
+	mkdir -p ${lib_dir}
+	echo -n "${LIBCFA_GENERAL_ARGS} " > ${lib_dir}/config.data
+	echo -n "${LIBCFA_PATHS} " >> ${lib_dir}/config.data
+	echo -n "ARCHITECTURE=${lib_arch} " >> ${lib_dir}/config.data
+	echo -n "CONFIGURATION=${lib_config}" >> ${lib_dir}/config.data
 done