Index: automake/cfa.m4
===================================================================
--- automake/cfa.m4	(revision 0c1b5660b6f5a0957c905780ecc5883a812e52a7)
+++ automake/cfa.m4	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
@@ -6,4 +6,5 @@
 		cfa_prefix=${prefix}
 	fi
+	cfa_prefix="$(readlink -f ${cfa_prefix})/"
 	AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
 	AC_SUBST(CFA_PREFIX, ${cfa_prefix})
@@ -14,4 +15,5 @@
 		cfa_incdir=${includedir}
 	fi
+	cfa_incdir="$(readlink -f ${cfa_incdir})/"
 	AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
 	AC_SUBST(CFA_INCDIR, ${cfa_incdir})
@@ -22,4 +24,5 @@
 		cfa_bindir=${bindir}
 	fi
+	cfa_bindir="$(readlink -f ${cfa_bindir})/"
 	AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
 	AC_SUBST(CFA_BINDIR, ${cfa_bindir})
@@ -34,4 +37,5 @@
 		cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
 	fi
+	cfa_libdir="$(readlink -f ${cfa_libdir})/"
 	AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
 	AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
Index: configure
===================================================================
--- configure	(revision 0c1b5660b6f5a0957c905780ecc5883a812e52a7)
+++ configure	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
@@ -3234,4 +3234,5 @@
 		cfa_prefix=${prefix}
 	fi
+	cfa_prefix="$(readlink -f ${cfa_prefix})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3247,4 +3248,5 @@
 		cfa_incdir=${includedir}
 	fi
+	cfa_incdir="$(readlink -f ${cfa_incdir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3260,4 +3262,5 @@
 		cfa_bindir=${bindir}
 	fi
+	cfa_bindir="$(readlink -f ${cfa_bindir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3277,4 +3280,5 @@
 		cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
 	fi
+	cfa_libdir="$(readlink -f ${cfa_libdir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3289,9 +3293,6 @@
 # Create variables for commonly used targets
 
-TOP_SRCDIR=$(readlink -f $ac_confdir/)
-TOP_BUILDDIR=$(readlink -f $ac_pwd/)
-
-echo ${TOP_SRCDIR}
-echo ${TOP_BUILDDIR}
+TOP_SRCDIR="$(readlink -f $ac_confdir/)/"
+TOP_BUILDDIR="$(readlink -f $ac_pwd/)/"
 
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 0c1b5660b6f5a0957c905780ecc5883a812e52a7)
+++ configure.ac	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
@@ -80,9 +80,6 @@
 # Create variables for commonly used targets
 
-TOP_SRCDIR=$(readlink -f $ac_confdir/)
-TOP_BUILDDIR=$(readlink -f $ac_pwd/)
-
-echo ${TOP_SRCDIR}
-echo ${TOP_BUILDDIR}
+TOP_SRCDIR="$(readlink -f $ac_confdir/)/"
+TOP_BUILDDIR="$(readlink -f $ac_pwd/)/"
 
 AC_DEFINE_UNQUOTED(TOP_SRCDIR, "$TOP_SRCDIR", [Top src directory])