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 410a9c49ac6aaf4b677fd9c0f33195efda48dc64..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="   "
@@ -15,7 +16,7 @@ CCFLAGS =
 .NO_PARALLEL:
 #endif /* SunArchitecture */
 
-FORCE_SHIP = -E
+FORCE_SHIP = -F
 
 MALLOCOBJ =
 
@@ -31,7 +32,6 @@ KSH_OBJS = \
 
 OBJS = $(KSH_OBJS) $(KSH_LIBS)
 
-
 SUIDEXECDEFINES = \
        -DPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/profile\" \
        -DSUIDPROFILEPATH=\"$(CDE_CONFIGURATION_TOP)/config/suid_profile\" \
@@ -39,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
 
@@ -57,15 +58,7 @@ ALL_SUBS = *
 
 ksh93src:
        $(RM) $(SHIP_DIR)/$(ALL_SUBS)/$(ALL_SUBS)/BUILT; \
-       if [ -f /bin/ksh ]; \
-       then \
-               SHELL=/bin/ksh CC=$(CC) CCFLAGS="$(CCFLAGS)" /bin/ksh ship/shipin $(FORCE_SHIP); \
-       elif [ -f /bin/sh ]; \
-       then \
-               SHELL=/bin/sh CC=$(CC) CCFLAGS="$(CCFLAGS)"  /bin/sh ship/shipin $(FORCE_SHIP); \
-       else \
-               SHELL="" CC=$(CC) CCFLAGS="$(CCFLAGS)"  ship/shipin $(FORCE_SHIP); \
-       fi
+       SHELL=$(KORNSHELL) CC="$(CC)" CCFLAGS="$(CCFLAGS)" ICCFLAGS="$(ICCFLAGS)" $(KORNSHELL) ship/shipin $(FORCE_SHIP)
 
 ksh93.o: $(OBJS)
        $(LD) -r -o $@ $(OBJS)