diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-12-11 17:10:52 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-12-11 17:10:52 +0000 |
| commit | 1bb6af069e9022e2ed0f01e23ed25541d5f47c3a (patch) | |
| tree | 0c0e900d08b155640ddec294ebc33fb7d514ec0a /java/jdk16/files/patch-deploy::common::config.gmk | |
| parent | - Respect X11BASE (diff) | |
. Replace some hardwired /usr/X11R6 instances with X11BASE. [1]
. Replace some hardwired /usr/local instances with LOCALBASE.
. Small Makefile restructure to keep related variables in one place.
. Add ipv6 to CATEGORIES if its enabled. [2]
PR: 106130 [2]
Submitted by: Janos Mohacsi <janos.mohacsi@bsd.hu> [2]
Pointed out by: pointyhat (via kris) [1]
Notes
Notes:
svn path=/head/; revision=179502
Diffstat (limited to 'java/jdk16/files/patch-deploy::common::config.gmk')
| -rw-r--r-- | java/jdk16/files/patch-deploy::common::config.gmk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-deploy::common::config.gmk b/java/jdk16/files/patch-deploy::common::config.gmk new file mode 100644 index 000000000000..b9592c5b0206 --- /dev/null +++ b/java/jdk16/files/patch-deploy::common::config.gmk @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- ../../deploy/make/plugin/common/config.gmk.orig Sun Dec 10 21:40:24 2006 ++++ ../../deploy/make/plugin/common/config.gmk Sun Dec 10 21:40:59 2006 +@@ -44,9 +44,9 @@ + + ifeq ($(LINUX_OR_BSD), true) + PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/solaris +- OTHER_LDFLAGS = -L/usr/X11R6/lib ++ OTHER_LDFLAGS = -L$(X11BASE)/lib + ifeq ($(TRUE_PLATFORM), NetBSD) +- OTHER_LDFLAGS += -Wl,-R/usr/X11R6/lib ++ OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib + endif + endif + |