Index: libcfa/configure.ac
===================================================================
--- libcfa/configure.ac	(revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4)
+++ libcfa/configure.ac	(revision 0c30ecc5ea7a75e702bd47070432649f203cad0d)
@@ -8,5 +8,7 @@
 AM_SILENT_RULES([yes])
 
-m4_include([../automake/cfa.m4])
+m4_include([../build/tools/cfa.m4])
+CFAMAKE='include $(top_srcdir)/../tools/build/cfa.make'
+AC_SUBST([CFAMAKE])
 
 AM_INIT_AUTOMAKE([subdir-objects])
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4)
+++ libcfa/src/Makefile.am	(revision 0c30ecc5ea7a75e702bd47070432649f203cad0d)
@@ -19,5 +19,5 @@
 ACLOCAL_AMFLAGS  = -I automake
 
-include $(srcdir)/../../src/cfa.make
+@CFAMAKE@
 
 libdir = ${CFA_LIBDIR}