From: Nina Didenko <nina.didenko@gmail.com>
Date: Sun, 24 Nov 2019 07:42:05 +0000 (+0300)
Subject: tt_type_comp: use CppCmd definition
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9221c55a5f811986eaf0e01301827c294ac2e29b;p=oweals%2Fcde.git

tt_type_comp: use CppCmd definition

Hi.

This patch makes tt_type_comp respect CppCmd

Thanks!
---

diff --git a/cde/lib/tt/bin/tt_type_comp/Imakefile b/cde/lib/tt/bin/tt_type_comp/Imakefile
index 92179208..62434929 100644
--- a/cde/lib/tt/bin/tt_type_comp/Imakefile
+++ b/cde/lib/tt/bin/tt_type_comp/Imakefile
@@ -8,7 +8,9 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include "../../tooltalk.tmpl"
 
-DEFINES = 
+CPP_PROGRAM = CppCmd
+CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
+DEFINES = $(CPP_DEFINES)
 INCLUDES = $(TIRPCINC) -I../../lib -I../../slib
 
 DEPLIBS         = ../../slib/libstt.a TtClientDepLibs
diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h
index 4315daa8..e23bb9e5 100644
--- a/cde/lib/tt/lib/tt_options.h
+++ b/cde/lib/tt/lib/tt_options.h
@@ -529,4 +529,9 @@
 
 #endif
 
+#ifdef CPP_PROGRAM
+# undef OPT_CPP_PATH
+# define OPT_CPP_PATH CPP_PROGRAM
+#endif
+
 #endif				/* _TT_OPTIONS_H */