java/jdk14/files/patch-plugin::common::config.gmk


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21

$FreeBSD$

--- ../../deploy/make/plugin/common/config.gmk.orig	Wed Nov 12 16:53:30 2003
+++ ../../deploy/make/plugin/common/config.gmk	Wed Nov 12 16:53:43 2003
@@ -52,7 +52,6 @@
 
 ifeq ($(PLATFORM), bsd)
   PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris
-  X11BASE = /usr/X11R6
   OTHER_LDFLAGS = -L$(X11BASE)/lib
   ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM)))
     OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib
@@ -61,7 +60,7 @@
 
   # include search paths
   # XXXBSD: these should be defined in other place
-  CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include
+  CPPFLAGS1 += -I$(X11BASE)/include -I${LOCALBASE}/include
 
   ifeq ($(TRUE_PLATFORM), FreeBSD)
       LDFLAGS_COMMON += -pthread