diff --git a/cde/lib/tt/bin/tt_type_comp/Makefile.am b/cde/lib/tt/bin/tt_type_comp/Makefile.am
index fba861057..b79fd24cd 100644
--- a/cde/lib/tt/bin/tt_type_comp/Makefile.am
+++ b/cde/lib/tt/bin/tt_type_comp/Makefile.am
@@ -12,7 +12,7 @@ mp_types_gram.h:
 bin_PROGRAMS = tt_type_comp
 
 tt_type_comp_CXXFLAGS = -I../../lib -I../../slib \
-			$(TT_VERSION_DEFINE) -DCPP_PROGRAM="\"$(CPP)\""
+			$(TT_VERSION_DEFINE) -DCPP_PROGRAM="\"$(GENCPP)\""
 
 tt_type_comp_SOURCES = mp_type_comp.C        mp_types_table.C \
 		frozen.mp_types_lex.C frozen.mp_types_gram.C
diff --git a/cde/programs/tttypes/Makefile.am b/cde/programs/tttypes/Makefile.am
index e083aeee5..47471a49e 100644
--- a/cde/programs/tttypes/Makefile.am
+++ b/cde/programs/tttypes/Makefile.am
@@ -6,6 +6,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 SUFFIXES: .ptype .done
 
+# FIXME - dtinfo ones use #include which seems to fail with syntax error...
+
 LOCALDEPFILES = \
         dtfile.done \
         dticon.done \
@@ -20,6 +22,9 @@ LOCALDEPFILES = \
 BUILT_SOURCES = types.xdr
 CLEANFILES = *.done types.xdr .tt_lock
 
+tttypesdir = $(CDE_INSTALLATION_TOP)/appconfig/tttypes
+dist_tttypes_DATA = $(BUILT_SOURCES)
+
 types.xdr: $(LOCALDEPFILES)
 
 TT_TYPE_COMP = $(top_builddir)/lib/tt/bin/tt_type_comp/tt_type_comp