external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 19:52:20 +00:00
Code Issues Releases Wiki Activity

Use $(SHELL) and $(KORNSHELL) for shell scripts

Browse source 
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.
This commit is contained in:
Marcin Cieslak 2012-08-14 15:31:56 +02:00 committed by Jon Trulson
parent d3206f4514
commit d6b6353f95
8 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cde/admin/IntegTools/post_install/Imakefile
View file

@ -10,7 +10,8 @@ XCOMM $TOG: Imakefile /main/13 1998/03/11 16:20:10 mgreess $
TOOL_DIR = ../dbTools TOOL_DIR = ../dbTools
DATABASE_DIR = ../../../databases 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 #ifdef HPArchitecture
PLATFORM = hp-ux PLATFORM = hp-ux
@ -53,62 +54,62 @@ MakeSubdirs($(SUBDIRS))
all:: all::
configHelp:: $(DATABASE_DIR)/CDE-HELP-C.udb 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 $(DATABASE_DIR)/CDE-HELP-C.udb > CDE-HELP-C.lst
$(BUILD_UDB_TOOL) CDE-HELP-C ../../.. $(BUILD_UDB_TOOL) CDE-HELP-C ../../..
configHelpPrg:: $(DATABASE_DIR)/CDE-HELP-PRG.udb 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 $(DATABASE_DIR)/CDE-HELP-PRG.udb > CDE-HELP-PRG.lst
$(BUILD_UDB_TOOL) CDE-HELP-PRG ../../.. $(BUILD_UDB_TOOL) CDE-HELP-PRG ../../..
configDemos:: $(DATABASE_DIR)/CDE-DEMOS.udb 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 $(DATABASE_DIR)/CDE-DEMOS.udb > CDE-DEMOS.lst
$(BUILD_UDB_TOOL) CDE-DEMOS ../../.. $(BUILD_UDB_TOOL) CDE-DEMOS ../../..
configFonts:: $(DATABASE_DIR)/CDE-FONTS.udb 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 $(DATABASE_DIR)/CDE-FONTS.udb > CDE-FONTS.lst
$(BUILD_UDB_TOOL) CDE-FONTS ../../.. $(BUILD_UDB_TOOL) CDE-FONTS ../../..
configHelpRun:: $(DATABASE_DIR)/CDE-HELP-RUN.udb 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 $(DATABASE_DIR)/CDE-HELP-RUN.udb > CDE-HELP-RUN.lst
$(BUILD_UDB_TOOL) CDE-HELP-RUN ../../.. $(BUILD_UDB_TOOL) CDE-HELP-RUN ../../..
configIcons:: $(DATABASE_DIR)/CDE-ICONS.udb 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 $(DATABASE_DIR)/CDE-ICONS.udb > CDE-ICONS.lst
$(BUILD_UDB_TOOL) CDE-ICONS ../../.. $(BUILD_UDB_TOOL) CDE-ICONS ../../..
configInc:: $(DATABASE_DIR)/CDE-INC.udb 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 $(DATABASE_DIR)/CDE-INC.udb > CDE-INC.lst
$(BUILD_UDB_TOOL) CDE-INC ../../.. $(BUILD_UDB_TOOL) CDE-INC ../../..
configManDev:: $(DATABASE_DIR)/CDE-MAN-DEV.udb 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 $(DATABASE_DIR)/CDE-MAN-DEV.udb > CDE-MAN-DEV.lst
$(BUILD_UDB_TOOL) CDE-MAN-DEV ../../.. $(BUILD_UDB_TOOL) CDE-MAN-DEV ../../..
configMan:: $(DATABASE_DIR)/CDE-MAN.udb 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 $(DATABASE_DIR)/CDE-MAN.udb > CDE-MAN.lst
$(BUILD_UDB_TOOL) CDE-MAN ../../.. $(BUILD_UDB_TOOL) CDE-MAN ../../..
configMsgCat:: $(DATABASE_DIR)/CDE-MSG-C.udb 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 $(DATABASE_DIR)/CDE-MSG-C.udb > CDE-MSG-C.lst
$(BUILD_UDB_TOOL) CDE-MSG-C ../../.. $(BUILD_UDB_TOOL) CDE-MSG-C ../../..
configPrg:: $(DATABASE_DIR)/CDE-PRG.udb 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 $(DATABASE_DIR)/CDE-PRG.udb > CDE-PRG.lst
$(BUILD_UDB_TOOL) CDE-PRG ../../.. $(BUILD_UDB_TOOL) CDE-PRG ../../..
configShlibs:: $(DATABASE_DIR)/CDE-SHLIBS.udb 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 $(DATABASE_DIR)/CDE-SHLIBS.udb > CDE-SHLIBS.lst
$(BUILD_UDB_TOOL) CDE-SHLIBS ../../.. $(BUILD_UDB_TOOL) CDE-SHLIBS ../../..

2
cde/config/cf/FreeBSD.cf
View file

@ -30,6 +30,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif #endif
#undef InstallCmd #undef InstallCmd
#define InstallCmd /usr/bin/install #define InstallCmd /usr/bin/install
#undef KornShell
#define KornShell /usr/local/bin/ksh93
#define UseGas YES #define UseGas YES
#ifndef GccUsesGas #ifndef GccUsesGas

4
cde/config/cf/Imake.tmpl
View file

@ -180,6 +180,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef BourneShell /* to force shell in makefile */ #ifndef BourneShell /* to force shell in makefile */
#define BourneShell /bin/sh #define BourneShell /bin/sh
#endif #endif
#ifndef KornShell
#define KornShell /bin/ksh
#endif
#ifndef ConstructMFLAGS #ifndef ConstructMFLAGS
#if SystemV #if SystemV
#define ConstructMFLAGS YES /* build MFLAGS from MAKEFLAGS */ #define ConstructMFLAGS YES /* build MFLAGS from MAKEFLAGS */
@ -889,6 +892,7 @@ XCOMM the platform-specific parameters - edit site.def to change
PATHSEP = PathSeparator PATHSEP = PathSeparator
SHELL = BourneShell SHELL = BourneShell
KORNSHELL = KornShell
TOP = TOPDIR TOP = TOPDIR
CURRENT_DIR = CURDIR CURRENT_DIR = CURDIR

1
cde/config/cf/README
View file

@ -90,6 +90,7 @@ Imake.tmpl provides defaults for the following variables:
InstPgmFlags install flags for normal programs InstPgmFlags install flags for normal programs
InstUidFlags install flags for xterm to chown /dev/ptys InstUidFlags install flags for xterm to chown /dev/ptys
InstallCmd command to install files InstallCmd command to install files
KornShell command used to run Korn Shell
Krb5Includes where to include Kerberos header files from Krb5Includes where to include Kerberos header files from
Krb5Libraries where to load Kerberos libraries from Krb5Libraries where to load Kerberos libraries from
LdCmd command to run loader LdCmd command to run loader

2
cde/databases/Imakefile
View file

@ -100,7 +100,7 @@ CONVERSION= -toDB
.udb.db: .udb.db:
@echo "making $*.db" @echo "making $*.db"
@$(RM) $*.db @$(RM) $*.db
$(TOOLSRC)/$(DBTOOLS)/udbToAny.ksh $(CONVERSION) $(UDB_RELEASE_OPT) $< > $*.db $(KORNSHELL) $(TOOLSRC)/$(DBTOOLS)/udbToAny.ksh $(CONVERSION) $(UDB_RELEASE_OPT) $< > $*.db
all:: all::

2
cde/programs/dtprintinfo/Imakefile
View file

@ -68,7 +68,7 @@ DEFINES = -D_TOOLTALK
#endif #endif
/* special processing for message files */ /* special processing for message files */
SYM2NUM_CMD = ./sym2num SYM2NUM_CMD = $(SHELL) sym2num
SRCS = DtPrintinfo.C SRCS = DtPrintinfo.C
OBJS = libUI/BaseUI.o objects/BaseObj.o DtPrintinfo.o OBJS = libUI/BaseUI.o objects/BaseObj.o DtPrintinfo.o

2
cde/programs/dtterm/Imakefile
View file

@ -87,7 +87,7 @@ clean::
dtterm.ti: terminfoChecklist dtterm.ti: terminfoChecklist
$(RM) $@ $(RM) $@
CPP="$(CPP) $(TIC_DEFINES)" ./terminfoCreate < terminfoChecklist > $@ CPP="$(CPP) $(TIC_DEFINES)" $(SHELL) terminfoCreate < terminfoChecklist > $@
includes:: dtterm.ti includes:: dtterm.ti
depend:: dtterm.ti depend:: dtterm.ti
all:: dtterm.ti all:: dtterm.ti

4
cde/programs/localized/templates/header2.tmpl
View file

@ -87,7 +87,7 @@ includes:: @@\
$(MAKEMESSCAT) $(GENCATFLAGS) $@ $(LANG) $(MAKEMESSCAT) $(GENCATFLAGS) $@ $(LANG)
#endif #endif
MAKEMESSCAT = $(CDESRC)/localized/util/makeMessCat MAKEMESSCAT = $(KORNSHELL) $(CDESRC)/localized/util/makeMessCat
SYM2NUM_CMD = $(CDESRC)/dtprintinfo/sym2num SYM2NUM_CMD = $(SHELL) $(CDESRC)/dtprintinfo/sym2num
MsgCatRule() MsgCatRule()