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/jdk15/files/patch-j2se::common::Defs-bsd.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/jdk15/files/patch-j2se::common::Defs-bsd.gmk')
| -rw-r--r-- | java/jdk15/files/patch-j2se::common::Defs-bsd.gmk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk index 5fe62075f469..cad7b38ea1a0 100644 --- a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk +++ b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk @@ -1,13 +1,22 @@ $FreeBSD$ ---- ../../j2se/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:03:20 2005 -+++ ../../j2se/make/common/Defs-bsd.gmk Thu Jan 13 02:03:38 2005 +--- ../../j2se/make/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:52 2006 ++++ ../../j2se/make/common/Defs-bsd.gmk Sun Dec 10 21:48:51 2006 @@ -180,7 +180,7 @@ ifeq ($(TRUE_PLATFORM), NetBSD) DEVTOOLS_PATH = /usr/pkg/bin/ else -DEVTOOLS_PATH = /usr/local/bin/ -+DEVTOOLS_PATH = ${LOCALBASE}/bin/ ++DEVTOOLS_PATH = $(LOCALBASE)/bin/ endif # Allow the user to override the default value... ifdef ALT_DEVTOOLS_PATH +@@ -434,7 +434,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 = |