Index: tools/prettyprinter/Makefile.in
===================================================================
--- tools/prettyprinter/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
+++ tools/prettyprinter/Makefile.in	(revision f5751247c5dae088b257037c5744c472f8c3ec30)
@@ -100,5 +100,5 @@
 	$(top_srcdir)/automake/ltversion.m4 \
 	$(top_srcdir)/automake/lt~obsolete.m4 \
-	$(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -239,4 +239,5 @@
 CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
+CFAMAKE = @CFAMAKE@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@