dtopen: make it build

Also, move localized subdir to last in current list of programs/ SUBDIRS

diff --git a/cde/configure.ac b/cde/configure.ac
index 9d8ff1f6fa8bc5e4adc05fff01517268eebf1bd4..e26b0f0782c0aa87be1305d96e0cf5bf22b2bd4b 100644 (file)
--- 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 4c0312aab8ba76fc66b80609178d60eee612b961..5c220e8f30838bb86716b2f1cc13a7a6bfaeb191 100644 (file)
--- 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 77bf9ad1c51e790b2a70de82eeeaa460057612d3..b069fb9ccc991ed8da045543f647122bc903e3d7 100644 (file)
--- 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 4f1d0c9a00adb0e8ed2c0bed86e6938afe623e6f..72c3b3e461e818dded533ab7952b83796dd1153f 100755 (executable)
--- 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