From 56fb574793d360eb30f37200d33b5df56890e726 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Fri, 22 Nov 2019 17:14:27 -0700
Subject: [PATCH] dtopen: make it build

Also, move localized subdir to last in current list of programs/ SUBDIRS
---
 cde/configure.ac                |  2 ++
 cde/programs/Makefile.am        |  2 +-
 cde/programs/dtopen/Makefile.am | 15 ++++++++++-----
 cde/programs/dtopen/dtopen.src  |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cde/configure.ac b/cde/configure.ac
index 9d8ff1f6f..e26b0f078 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -470,6 +470,8 @@ programs/tttypes/Makefile
 programs/util/Makefile
 programs/util/dttypes/Makefile
 
+programs/dtopen/Makefile
+
 ])
 
 AC_OUTPUT
diff --git a/cde/programs/Makefile.am b/cde/programs/Makefile.am
index 4c0312aab..5c220e8f3 100644
--- a/cde/programs/Makefile.am
+++ b/cde/programs/Makefile.am
@@ -5,6 +5,6 @@ SUBDIRS = backdrops icons dsdm dtmail dtpad dtfile dtwm dtlogin \
 	dtaction dtspcd dtscreen dtcm dtsearchpath  \
 	dtappintegrate dtprintegrate dtconfig dtcreate dtprintinfo fontaliases \
 	dtdspmsg dtimsstart dtpdm dtsr dtpdmd types \
-	localized tttypes util dtopen
+	tttypes util dtopen localized
 
 # NOTYET = dthelp dtksh dtappbuilder dtdocbook dtinfo nsgmls ttsnoop 
diff --git a/cde/programs/dtopen/Makefile.am b/cde/programs/dtopen/Makefile.am
index 77bf9ad1c..b069fb9cc 100644
--- a/cde/programs/dtopen/Makefile.am
+++ b/cde/programs/dtopen/Makefile.am
@@ -2,9 +2,14 @@ MAINTAINERCLEANFILES = Makefile.in
 
 dist_bin_SCRIPTS = dtopen
 
-SCRIPTFLAGS = -DCDE_INSTALLATION_TOP=${prefix} \
-	      -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
+LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
+		-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
+		-DKORNSHELL=$(KSH)
+
+BUILT_SOURCES = dtopen
+CLEANFILES = $(BUILT_SOURCES)
+
+dtopen: dtopen.src
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPTARGET = dtopen
-CPPSRC = dtopen.src
-include $(srcdir)/include/cppfile.tmpl
diff --git a/cde/programs/dtopen/dtopen.src b/cde/programs/dtopen/dtopen.src
index 4f1d0c9a0..72c3b3e46 100755
--- a/cde/programs/dtopen/dtopen.src
+++ b/cde/programs/dtopen/dtopen.src
@@ -1,4 +1,4 @@
-XCOMM!/bin/ksh
+XCOMM!KORNSHELL
 XCOMM
 XCOMM dtopen - provide an interface for some useful applications.
 XCOMM