Bugzilla bug #62855: backed out my previous checkin, which doesn't quite

work.  Will look at this later.
Modified files: arch.mk, config.mk

security/coreconf/arch.mk

@@ -239,7 +239,11 @@ endif
 # This variable is used to get OS_CONFIG.mk.
 #
 
+ifeq ($(OS_ARCH),OS2)
+OS_CONFIG = $(OS_TARGET)
+else
 OS_CONFIG = $(OS_TARGET)$(OS_RELEASE)
+endif
 
 #
 # OBJDIR_TAG depends on the predefined variable BUILD_OPT,

security/coreconf/config.mk

@@ -56,7 +56,7 @@ include $(CORE_DEPTH)/coreconf/command.mk
 #       each OS release.                                              #
 #######################################################################
 
-ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET)))
+ifeq (,$(filter-out NetBSD,$(OS_TARGET)))
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
 else
 include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk