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.

diff --git a/cde/config/cf/Imake.tmpl b/cde/config/cf/Imake.tmpl
index db4a1b9357b2f1da8912de86dce8fc859bae9fc0..75fa2919bd6621812b509d1a564635936b9054a0 100644 (file)
--- 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 afbb58411d5e6029d1ea4d12ff496f17bac7f4bd..1ebc7a05979d6a27dd1c54998a540635f010adb3 100644 (file)
--- 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 63baf8aa7c0eb77464b098987fdeb2de56bb546f..acb48f51b5b0f34e9a19974d1af9ba4983b9ce2a 100644 (file)
--- 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 9b7be11886ea9a9c25061e45690c91cd27621cc0..bffa2f6e6ceb67e01109e3b564d92df2faa5e0c0 100755 (executable)
--- 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 c776c312c4be48ea0738a3550efd25ff16377f73..73ddb0166eeecb7cc17b15fe8aa4630cb4a9073e 100644 (file)
--- 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 a960851e1c0579440284d2834a5b8ffb348c5709..0752ededb08231f96eff140a4baaecb02583667f 100644 (file)
--- 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 f0ca39801499f00c8b9d824650fed2bc41ce6dfa..189167ab96a87e6478a65aa1691a1045f70f96cb 100644 (file)
--- 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