Fixes to help get UnixWare 7 builds off the floor.

config/UNIXWARE.mk

@@ -60,8 +60,8 @@ I2_LOCALE		= i2
 # Version-specific stuff
 ######################################################################
 
-ifeq ($(OS_RELEASE),5)
-PLATFORM_FLAGS		+= -DUnixWare -DUNIXWARE5
+ifeq ($(OS_RELEASE),7)
+PLATFORM_FLAGS		+= -DUnixWare -DUNIXWARE7
 PORT_FLAGS		+= -DSVR5 -D_SIMPLE_R
 
 BUILD_UNIX_PLUGINS	= 1
@@ -75,11 +75,17 @@ endif
 # Overrides for defaults in config.mk (or wherever)
 ######################################################################
 
-CC			= $(DEPTH)/build/hcc
-CCC			= $(DEPTH)/build/hcpp
 EMACS			= /bin/true
 WHOAMI			= /usr/ucb/whoami
 
+ifeq ($(OS_RELEASE),2.1)
+CC			= $(DEPTH)/build/hcc
+CCC			= $(DEPTH)/build/hcpp
+else
+CC			= cc
+CCC			= CC
+endif
+
 ifdef NETSCAPE_HIERARCHY
 PERL			= perl5
 endif

config/config.mk

@@ -82,6 +82,7 @@ OS_TEST		:= $(shell uname -p)
 endif
 ifeq ($(OS_ARCH),UnixWare)
 OS_ARCH		:= UNIXWARE
+OS_RELEASE	:= $(shell uname -v)
 endif
 
 #