Introduce KORNSHELL make variable to point
to the implementation of the Korn Shell.
Use $(SHELL) or $(KORNSHELL) explicitly for
make programs that do not automatically call
shell scripts from the current directory.
---
cde/admin/IntegTools/post_install/Imakefile | 27 +++++++++++++------------
cde/config/cf/FreeBSD.cf | 2 ++
cde/config/cf/Imake.tmpl | 4 ++++
cde/config/cf/README | 1 +
cde/databases/Imakefile | 2 +-
cde/programs/dtprintinfo/Imakefile | 2 +-
cde/programs/dtterm/Imakefile | 2 +-
cde/programs/localized/templates/header2.tmpl | 4 ++--
8 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/cde/admin/IntegTools/post_install/Imakefile
b/cde/admin/IntegTools/post_install/Imakefile
index 0120a40..3b6bc43 100644
--- a/cde/admin/IntegTools/post_install/Imakefile
+++ b/cde/admin/IntegTools/post_install/Imakefile
@@ -10,7 +10,8 @@ XCOMM $TOG: Imakefile /main/13 1998/03/11 16:20:10 mgreess $
TOOL_DIR = ../dbTools
DATABASE_DIR = ../../../databases
-BUILD_UDB_TOOL = ./build_udb_list
+BUILD_UDB_TOOL = $(SHELL) build_udb_list
+UDB_TOOL = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh
#ifdef HPArchitecture
PLATFORM = hp-ux
@@ -53,62 +54,62 @@ MakeSubdirs($(SUBDIRS))
all::
configHelp:: $(DATABASE_DIR)/CDE-HELP-C.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-C.udb > CDE-HELP-C.lst
$(BUILD_UDB_TOOL) CDE-HELP-C ../../..
configHelpPrg:: $(DATABASE_DIR)/CDE-HELP-PRG.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-PRG.udb > CDE-HELP-PRG.lst
$(BUILD_UDB_TOOL) CDE-HELP-PRG ../../..
configDemos:: $(DATABASE_DIR)/CDE-DEMOS.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-DEMOS.udb > CDE-DEMOS.lst
$(BUILD_UDB_TOOL) CDE-DEMOS ../../..
configFonts:: $(DATABASE_DIR)/CDE-FONTS.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-FONTS.udb > CDE-FONTS.lst
$(BUILD_UDB_TOOL) CDE-FONTS ../../..
configHelpRun:: $(DATABASE_DIR)/CDE-HELP-RUN.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-RUN.udb > CDE-HELP-RUN.lst
$(BUILD_UDB_TOOL) CDE-HELP-RUN ../../..
configIcons:: $(DATABASE_DIR)/CDE-ICONS.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-ICONS.udb > CDE-ICONS.lst
$(BUILD_UDB_TOOL) CDE-ICONS ../../..
configInc:: $(DATABASE_DIR)/CDE-INC.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-INC.udb > CDE-INC.lst
$(BUILD_UDB_TOOL) CDE-INC ../../..
configManDev:: $(DATABASE_DIR)/CDE-MAN-DEV.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MAN-DEV.udb > CDE-MAN-DEV.lst
$(BUILD_UDB_TOOL) CDE-MAN-DEV ../../..
configMan:: $(DATABASE_DIR)/CDE-MAN.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MAN.udb > CDE-MAN.lst
$(BUILD_UDB_TOOL) CDE-MAN ../../..
configMsgCat:: $(DATABASE_DIR)/CDE-MSG-C.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MSG-C.udb > CDE-MSG-C.lst
$(BUILD_UDB_TOOL) CDE-MSG-C ../../..
configPrg:: $(DATABASE_DIR)/CDE-PRG.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-PRG.udb > CDE-PRG.lst
$(BUILD_UDB_TOOL) CDE-PRG ../../..
configShlibs:: $(DATABASE_DIR)/CDE-SHLIBS.udb
- $(TOOL_DIR)/udbToAny.ksh -toLst -ReleaseStream $(PLATFORM) \
+ $(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-SHLIBS.udb > CDE-SHLIBS.lst
$(BUILD_UDB_TOOL) CDE-SHLIBS ../../..
diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index dc37202..4f81bef 100644
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -30,6 +30,8 @@ XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#undef InstallCmd
#define InstallCmd /usr/bin/install
+#undef KornShell
+#define KornShell /usr/local/bin/ksh93
#define UseGas YES
#ifndef GccUsesGas
diff --git a/cde/config/cf/Imake.tmpl b/cde/config/cf/Imake.tmpl
index 080f4e9..fc8b419 100644
--- a/cde/config/cf/Imake.tmpl
+++ b/cde/config/cf/Imake.tmpl
@@ -180,6 +180,9 @@ XCOMM the platform-specific parameters - edit site.def to
change
#ifndef BourneShell /* to force shell in makefile */
#define BourneShell /bin/sh
#endif
+#ifndef KornShell
+#define KornShell /bin/ksh
+#endif
#ifndef ConstructMFLAGS
#if SystemV
#define ConstructMFLAGS YES /* build MFLAGS from MAKEFLAGS
*/
@@ -889,6 +892,7 @@ XCOMM the platform-specific parameters - edit site.def to
change
PATHSEP = PathSeparator
SHELL = BourneShell
+ KORNSHELL = KornShell
TOP = TOPDIR
CURRENT_DIR = CURDIR
diff --git a/cde/config/cf/README b/cde/config/cf/README
index d6c7445..ecbabcd 100644
--- a/cde/config/cf/README
+++ b/cde/config/cf/README
@@ -90,6 +90,7 @@ Imake.tmpl provides defaults for the following variables:
InstPgmFlags install flags for normal programs
InstUidFlags install flags for xterm to chown /dev/ptys
InstallCmd command to install files
+ KornShell command used to run Korn Shell
Krb5Includes where to include Kerberos header files from
Krb5Libraries where to load Kerberos libraries from
LdCmd command to run loader
diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile
index 0f6537a..3786440 100644
--- a/cde/databases/Imakefile
+++ b/cde/databases/Imakefile
@@ -100,7 +100,7 @@ CONVERSION= -toDB
.udb.db:
@echo "making $*.db"
@$(RM) $*.db
- $(TOOLSRC)/$(DBTOOLS)/udbToAny.ksh $(CONVERSION) $(UDB_RELEASE_OPT) $<
> $*.db
+ $(KORNSHELL) $(TOOLSRC)/$(DBTOOLS)/udbToAny.ksh $(CONVERSION)
$(UDB_RELEASE_OPT) $< > $*.db
all::
diff --git a/cde/programs/dtprintinfo/Imakefile
b/cde/programs/dtprintinfo/Imakefile
index ed42f6e..82ead70 100644
--- a/cde/programs/dtprintinfo/Imakefile
+++ b/cde/programs/dtprintinfo/Imakefile
@@ -68,7 +68,7 @@ DEFINES = -D_TOOLTALK
#endif
/* special processing for message files */
-SYM2NUM_CMD = ./sym2num
+SYM2NUM_CMD = $(SHELL) sym2num
SRCS = DtPrintinfo.C
OBJS = libUI/BaseUI.o objects/BaseObj.o DtPrintinfo.o
diff --git a/cde/programs/dtterm/Imakefile b/cde/programs/dtterm/Imakefile
index 847bf14..0b168a2 100644
--- a/cde/programs/dtterm/Imakefile
+++ b/cde/programs/dtterm/Imakefile
@@ -87,7 +87,7 @@ clean::
dtterm.ti: terminfoChecklist
$(RM) $@
- CPP="$(CPP) $(TIC_DEFINES)" ./terminfoCreate < terminfoChecklist > $@
+ CPP="$(CPP) $(TIC_DEFINES)" $(SHELL) terminfoCreate < terminfoChecklist
> $@
includes:: dtterm.ti
depend:: dtterm.ti
all:: dtterm.ti
diff --git a/cde/programs/localized/templates/header2.tmpl
b/cde/programs/localized/templates/header2.tmpl
index dc16ee1..753f11b 100644
--- a/cde/programs/localized/templates/header2.tmpl
+++ b/cde/programs/localized/templates/header2.tmpl
@@ -87,7 +87,7 @@ includes::
@@\
$(MAKEMESSCAT) $(GENCATFLAGS) $@ $(LANG)
#endif
-MAKEMESSCAT = $(CDESRC)/localized/util/makeMessCat
-SYM2NUM_CMD = $(CDESRC)/dtprintinfo/sym2num
+MAKEMESSCAT = $(KORNSHELL) $(CDESRC)/localized/util/makeMessCat
+SYM2NUM_CMD = $(SHELL) $(CDESRC)/dtprintinfo/sym2num
MsgCatRule()
--
1.7.9.2
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
