$OpenBSD: patch-j2sdk1_3_1_make_common_Defs-bsd_gmk,v 1.2 2005/06/03 17:27:54 kurt Exp $
--- j2sdk1.3.1/make/common/Defs-bsd.gmk.orig	Fri Apr 22 12:24:07 2005
+++ j2sdk1.3.1/make/common/Defs-bsd.gmk	Fri Apr 22 12:26:53 2005
@@ -32,9 +32,9 @@
 AR             = $(USRBIN_PATH)ar
 AS             = $(USRBIN_PATH)as
 CAT            = $(UNIXCOMMAND_PATH)cat
-CC             = $(COMPILER_PATH)gcc
-CPP            = $(COMPILER_PATH)gcc -E
-CXX            = $(COMPILER_PATH)g++
+CC            ?= $(COMPILER_PATH)gcc
+CPP           ?= $(COMPILER_PATH)gcc -E
+CXX           ?= $(COMPILER_PATH)g++
 CD             = cd # intrinsic unix command
 CHMOD          = $(UNIXCOMMAND_PATH)chmod
 CMP            = $(USRBIN_PATH)cmp
@@ -90,7 +90,7 @@ ZIPEXE         = $(DEVTOOLS_PATH)zip
 
 
 ifeq ($(TRUE_PLATFORM), OpenBSD)
-archExpr = $(UNAME) -m
+archExpr = arch -s
 else
 archExpr = $(UNAME) -p
 endif
@@ -413,7 +413,6 @@ ifeq ($(TRUE_PLATFORM), NetBSD)
 else
   ifeq ($(TRUE_PLATFORM), OpenBSD)
     MOTIF_DIR=/usr/local
-    CPPFLAGS_COMMON += -I$(MOTIF_DIR)/include
     LDFLAGS_COMMON += -L$(MOTIF_DIR)/lib -L/usr/X11R6/lib # for libXp
   else
     MOTIF_DIR=/usr/X11R6
