summaryrefslogtreecommitdiff
path: root/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk
blob: c7530004bd2693646970d743045a7defd35bd832 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
$FreeBSD$

--- ../../j2se/make/common/Defs-bsd.gmk.orig	Sun Mar  4 21:27:49 2007
+++ ../../j2se/make/common/Defs-bsd.gmk	Sun Mar  4 21:29:16 2007
@@ -180,7 +180,7 @@
 ifeq ($(TRUE_PLATFORM), NetBSD)
 DEVTOOLS_PATH = /usr/pkg/bin/
 else
-DEVTOOLS_PATH = /usr/local/bin/
+DEVTOOLS_PATH = $(LOCALBASE)/bin/
 endif
 # Allow the user to override the default value...
 ifdef ALT_DEVTOOLS_PATH
@@ -432,7 +432,7 @@
 override LIBTHREAD               =
 override MOOT_PRIORITIES         = true
 override NO_INTERRUPTIBLE_IO     = false
-override OPENWIN_HOME            = /usr/X11R6
+override OPENWIN_HOME            = $(X11BASE)
 override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
 override OTHER_M4FLAGS           = -DGNU_ASSEMBLER
 override SUN_CMM_SUBDIR          =
@@ -463,10 +463,10 @@
 # Motif settings
 #
 # XXX: OpenBSD confirm static motif still causes issues - truk
-ifeq ($(TRUE_PLATFORM), OpenBSD)
-STATIC_MOTIF=false
-else
+ifeq ($(TRUE_PLATFORM), NetBSD)
 STATIC_MOTIF=true
+else
+STATIC_MOTIF=false
 endif
 LIBM=-lm