From 25e98da92eb7431859d0131777e282e7e86b88ee Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Wed, 30 Oct 2019 18:59:25 -0600
Subject: [PATCH] dtfile: still working on cpp issues, a better solution is
 needed

I think it's time to try tradcpp.
---
 cde/programs/dtfile/Makefile.am | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/cde/programs/dtfile/Makefile.am b/cde/programs/dtfile/Makefile.am
index bfbec41f..c956232d 100644
--- a/cde/programs/dtfile/Makefile.am
+++ b/cde/programs/dtfile/Makefile.am
@@ -43,10 +43,16 @@ dtfile_SOURCES = ChangeDir.c     ChangeDirP.c    Command.c       Common.c \
 		 Prefs.c         PrefsP.c        SharedMsgs.c    SharedProcs.c \
 		 ToolTalk.c      Trash.c         Utils.c         fsDialog.c
 
+# Mind the quoting here...
+LOCAL_CPP_DEFINES = -DSHAPE -D_ILS_MACROS -DSUN_PERF \
+		-DCDE_INSTALLATION_TOP="${prefix}" \
+		-DCDE_CONFIGURATION_TOP="$(CDE_CONFIGURATION_TOP)" \
+		-DKORNSHELL="$(KSH)"
+
 dtfile.config: dtfile.config.cpp
-	$(RM) dtfile.config
-	$(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) dtfile.config.cpp -o dtfile.config
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
 dtfile_error: dtfile_error.cpp
-	$(RM) dtfile_error
-	$(CPP) -P -DXCOMM=# $(AM_CPPFLAGS) dtfile_error.cpp -o dtfile_error
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $<  > $@
-- 
2.25.1