From 943aaadf86f8b7e4b545e4a58c051cbb3538224c Mon Sep 17 00:00:00 2001
From: Pascal Stumpf <Pascal.Stumpf@cubes.de>
Date: Thu, 22 Nov 2012 15:49:51 +0100
Subject: [PATCH] Introduce DTKORNSHELL, analogous to KORNSHELL.

DTKORNSHELL is used to specify the install location of dtksh on your system,
preventing hardcoding of /usr/dt/bin/dtksh in Shebang lines and such.
---
 cde/config/cf/Imake.tmpl             | 4 ++++
 cde/config/cf/OpenBSD.cf             | 4 ++++
 cde/programs/dtprintegrate/Imakefile | 2 +-
 cde/programs/dtprintegrate/dtlp.src  | 2 +-
 cde/programs/types/Imakefile         | 2 +-
 cde/programs/types/dt.dt.src         | 4 ++--
 cde/programs/types/error.ds.src      | 2 +-
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cde/config/cf/Imake.tmpl b/cde/config/cf/Imake.tmpl
index db4a1b935..75fa2919b 100644
--- a/cde/config/cf/Imake.tmpl
+++ b/cde/config/cf/Imake.tmpl
@@ -183,6 +183,9 @@ XCOMM the platform-specific parameters - edit site.def to change
 #ifndef KornShell
 #define KornShell		/bin/ksh
 #endif
+#ifndef DtKornShell
+#define DtKornShell		/usr/dt/bin/dtksh
+#endif
 #ifndef ConstructMFLAGS
 #if SystemV
 #define ConstructMFLAGS		YES	/* build MFLAGS from MAKEFLAGS */
@@ -896,6 +899,7 @@ XCOMM the platform-specific parameters - edit site.def to change
           PATHSEP = PathSeparator
             SHELL = BourneShell
         KORNSHELL = KornShell
+      DTKORNSHELL = DtKornShell
 
               TOP = TOPDIR
       CURRENT_DIR = CURDIR
diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index afbb58411..1ebc7a059 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1028,6 +1028,10 @@ install:: fonts.alias							@@\
 #define KornShell               /usr/local/bin/ksh93
 #endif
 
+#ifndef DtKornShell
+#define DtKornShell		/usr/local/dt/bin/dtksh
+#endif
+
 #define AvoidNullMakeCommand	YES
 
 /* This must come last */
diff --git a/cde/programs/dtprintegrate/Imakefile b/cde/programs/dtprintegrate/Imakefile
index 63baf8aa7..acb48f51b 100644
--- a/cde/programs/dtprintegrate/Imakefile
+++ b/cde/programs/dtprintegrate/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:50:24 drk $
 
 CPP_DEFINES =   -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
 		-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-		-DKORNSHELL=$(KORNSHELL)
+		-DKORNSHELL=$(KORNSHELL) -DDTKORNSHELL=$(DTKORNSHELL)
 
 #if defined (SunArchitecture)
 LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun
diff --git a/cde/programs/dtprintegrate/dtlp.src b/cde/programs/dtprintegrate/dtlp.src
index 9b7be1188..bffa2f6e6 100755
--- a/cde/programs/dtprintegrate/dtlp.src
+++ b/cde/programs/dtprintegrate/dtlp.src
@@ -1,4 +1,4 @@
-XCOMM!/usr/dt/bin/dtksh
+XCOMM! DTKORNSHELL
 XCOMM $TOG: dtlp.src /main/17 1998/07/31 17:03:31 mgreess $
 XCOMM 
 XCOMM (c) Copyright 1996 Digital Equipment Corporation.
diff --git a/cde/programs/types/Imakefile b/cde/programs/types/Imakefile
index c776c312c..73ddb0166 100644
--- a/cde/programs/types/Imakefile
+++ b/cde/programs/types/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:52:31 drk $
 
 CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
 	-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-	-DKORNSHELL=$(KORNSHELL)
+	-DKORNSHELL=$(KORNSHELL) -DDTKORNSHELL=$(DTKORNSHELL)
 
 #if defined (SunArchitecture)
 LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun
diff --git a/cde/programs/types/dt.dt.src b/cde/programs/types/dt.dt.src
index a960851e1..0752ededb 100644
--- a/cde/programs/types/dt.dt.src
+++ b/cde/programs/types/dt.dt.src
@@ -135,13 +135,13 @@ DATA_CRITERIA DTKSH_SCRIPT2
 {
         DATA_ATTRIBUTES_NAME DTKSH_SCRIPT
 	MODE		f&x
-        CONTENT		0 string #!/usr/dt/bin/dtksh
+        CONTENT		0 string #!DTKORNSHELL
 }
 DATA_CRITERIA DTKSH_SCRIPT3
 {
         DATA_ATTRIBUTES_NAME DTKSH_SCRIPT
 	MODE		f&x
-        CONTENT		0 string #! /usr/dt/bin/dtksh
+        CONTENT		0 string #! DTKORNSHELL
 }
 ACTION Run
 {
diff --git a/cde/programs/types/error.ds.src b/cde/programs/types/error.ds.src
index f0ca39801..189167ab9 100644
--- a/cde/programs/types/error.ds.src
+++ b/cde/programs/types/error.ds.src
@@ -1,4 +1,4 @@
-XCOMM! /usr/dt/bin/dtksh
+XCOMM! DTKORNSHELL
 XCOMM  $XConsortium: error.ds.src /main/3 1996/04/23 17:35:47 drk $
 XCOMM #####################################################################
 XCOMM