Index: automake/cfa.m4
===================================================================
--- automake/cfa.m4	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ automake/cfa.m4	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -26,9 +26,42 @@
 
 	if test "$libdir" = '${exec_prefix}/lib'; then
-		cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
+		cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
 	else
-		cfa_libdir=${libdir}
+		cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
 	fi
 	AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
 	AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
 ])
+
+m4_define([M4CFA_PROGRAM_NAME], [
+	if test "${program_transform_name}" = ""; then
+	AC_MSG_ERROR([Program transform not supported.
+			Use --with-cfa-name='[[Desired name here]]' instead])
+	fi
+
+	#Define the new name of the installed command
+	AC_ARG_WITH(cfa-name,
+		[  --with-cfa-name=NAME     NAME too which cfa will be installed],
+		cfa_name=$withval, cfa_name="cfa")
+
+	AC_SUBST(CFA_NAME, ${cfa_name})
+])
+
+AC_DEFUN([M4CFA_CANNON_CPU], [
+	case $arch_name in
+		"x64"        ) cannon_arch_name="x64";;
+		"x86-64"     ) cannon_arch_name="x64";;
+		"x86_64"     ) cannon_arch_name="x64";;
+		"x86"        ) cannon_arch_name="x86";;
+		"i386"       ) cannon_arch_name="x86";;
+		"i486"       ) cannon_arch_name="x86";;
+		"i686"       ) cannon_arch_name="x86";;
+		"Intel 80386") cannon_arch_name="x86";;
+		"arm"        ) cannon_arch_name="arm";;
+		"ARM"        ) cannon_arch_name="arm";;
+		*)
+		>&2 echo "Unkown architecture " $arch_name;
+		exit 1
+		;;
+	esac
+])