Index: automake/cfa.m4
===================================================================
--- automake/cfa.m4	(revision ae628e1a462dc0616aa47dc33f168a660d2d1a3d)
+++ automake/cfa.m4	(revision 8e485801af761f44aff386d73de2167c3224c808)
@@ -6,23 +6,23 @@
 		cfa_prefix=${prefix}
 	fi
-	cfa_prefix="$(readlink -f ${cfa_prefix})/"
+	cfa_prefix="$(readlink -m ${cfa_prefix})/"
 	AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
 	AC_SUBST(CFA_PREFIX, ${cfa_prefix})
 
 	if test "$includedir" = '${prefix}/include'; then
-		cfa_incdir="${cfa_prefix}/include/${cfa_name}"
+		cfa_incdir="${cfa_prefix}include/${cfa_name}"
 	else
 		cfa_incdir=${includedir}
 	fi
-	cfa_incdir="$(readlink -f ${cfa_incdir})/"
+	cfa_incdir="$(readlink -m ${cfa_incdir})/"
 	AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
 	AC_SUBST(CFA_INCDIR, ${cfa_incdir})
 
 	if test "$bindir" = '${exec_prefix}/bin'; then
-		cfa_bindir="${cfa_prefix}/bin"
+		cfa_bindir="${cfa_prefix}bin"
 	else
 		cfa_bindir=${bindir}
 	fi
-	cfa_bindir="$(readlink -f ${cfa_bindir})/"
+	cfa_bindir="$(readlink -m ${cfa_bindir})/"
 	AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
 	AC_SUBST(CFA_BINDIR, ${cfa_bindir})
@@ -30,12 +30,12 @@
 	if test "$libdir" = '${exec_prefix}/lib'; then
 		if test "${ARCHITECTURE}" != ""; then
-			cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
+			cfa_libdir="${cfa_prefix}lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
 		else
-			cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
+			cfa_libdir="${cfa_prefix}lib/${cfa_name}/"
 		fi
 	else
 		cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
 	fi
-	cfa_libdir="$(readlink -f ${cfa_libdir})/"
+	cfa_libdir="$(readlink -m ${cfa_libdir})/"
 	AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
 	AC_SUBST(CFA_LIBDIR, ${cfa_libdir})