diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-01-20 16:39:05 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-01-20 16:39:05 +0000 |
| commit | c59b2ea8a8ae70e8af8c9a2858ab5f88f319444a (patch) | |
| tree | 6aa24431ffc4567bc2c8555ee64b15cead152281 /java/jdk14/files/patch-plugin::common::config.gmk | |
| parent | - Update to 1.2.01 (diff) | |
. Update to patchset 8.
Notes
Notes:
svn path=/head/; revision=153996
Diffstat (limited to 'java/jdk14/files/patch-plugin::common::config.gmk')
| -rw-r--r-- | java/jdk14/files/patch-plugin::common::config.gmk | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/java/jdk14/files/patch-plugin::common::config.gmk b/java/jdk14/files/patch-plugin::common::config.gmk index fd995e3c063b..d8a025a8d336 100644 --- a/java/jdk14/files/patch-plugin::common::config.gmk +++ b/java/jdk14/files/patch-plugin::common::config.gmk @@ -2,12 +2,20 @@ $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 -@@ -57,7 +57,7 @@ +@@ -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/usr/X11R6/include -I/usr/local/include -+ CPPFLAGS1 += -I/usr/X11R6/include -I${LOCALBASE}/include +- CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include ++ CPPFLAGS1 += -I$(X11BASE)/include -I${LOCALBASE}/include - ifeq ($(TRUE_PLATFORM), FreeSBD) - ifeq ($(FREEBSD_4STABLE), true) + ifeq ($(TRUE_PLATFORM), FreeBSD) + LDFLAGS_COMMON += -pthread |