From cdc9eae58316612ec5d233378a96e4fbefed6acb Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Mon, 2 Dec 2019 19:59:44 -0700
Subject: [PATCH] Get tttypes installed correctly.

There is a problem with CPP_PROGRAM - using $CPP or $GENCPP (tradcpp)
always fails in tt_type_comp with the error:

"nclude ", line 8: syntax error

If I define it to /lib/cpp (previous hardcoded value) then it seems to
work fine.  Only the dtinfo and dtinfo_start ptypes use #include, and
therefore show this error.  Needs investigation.
---
 cde/lib/tt/bin/tt_type_comp/Makefile.am | 2 +-
 cde/programs/tttypes/Makefile.am        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cde/lib/tt/bin/tt_type_comp/Makefile.am b/cde/lib/tt/bin/tt_type_comp/Makefile.am
index fba86105..b79fd24c 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 e083aeee..47471a49 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
-- 
2.25.1