dtksh/sfio: resolved a naming collision on FreeBSD 11

[oweals/cde.git] / cde / programs / dtksh / ksh93 / Imakefile

diff --git a/cde/programs/dtksh/ksh93/Imakefile b/cde/programs/dtksh/ksh93/Imakefile
index ee961cbefbe1926ba9f885bb643f4ada56ba8649..91e6f1aebd6875913fe556eba28f2ee461057cc3 100644 (file)
--- a/cde/programs/dtksh/ksh93/Imakefile
+++ b/cde/programs/dtksh/ksh93/Imakefile
@@ -4,6 +4,7 @@ SRCS =
 SUBCFLAGS = -O
 UFLAGS = $(SUBCFLAGS)
 ULDFLAGS =
+IFFECDEBUGFLAGS = -O0
 
 #ifdef RsArchitecture
 CCFLAGS = CCFLAGS="   "
@@ -31,8 +32,6 @@ KSH_OBJS = \
 
 OBJS = $(KSH_OBJS) $(KSH_LIBS)
 
-KSHELL?= /usr/local/bin/ksh93
-
 SUIDEXECDEFINES = \
        -DPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/profile\" \
        -DSUIDPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/suid_profile\" \
@@ -40,6 +39,7 @@ SUIDEXECDEFINES = \
        -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
 
 CCFLAGS = $(CDEBUGFLAGS) $(SUIDEXECDEFINES) $(STD_DEFINES) $(ANSI_DEFINES)
+ICCFLAGS = $(IFFECDEBUGFLAGS) $(STD_DEFINES) $(ANSI_DEFINES)
 
 all:: ksh93src ksh93.o
 
@@ -58,7 +58,7 @@ ALL_SUBS = *
 
 ksh93src:
        $(RM) $(SHIP_DIR)/$(ALL_SUBS)/$(ALL_SUBS)/BUILT; \
-       SHELL=$(KSHELL) CC=$(CC) CCFLAGS="$(CCFLAGS)" $(KSHELL) ship/shipin $(FORCE_SHIP)
+       SHELL=$(KORNSHELL) CC="$(CC)" CCFLAGS="$(CCFLAGS)" ICCFLAGS="$(ICCFLAGS)" $(KORNSHELL) ship/shipin $(FORCE_SHIP)
 
 ksh93.o: $(OBJS)
        $(LD) -r -o $@ $(OBJS)