From 4da04f553711638be6ea280a01661d27049be349 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Fri, 8 Dec 2006 22:36:16 +0000 Subject: . Replace some hardwired /usr/X11R6 instances with X11BASE. [1] . Small Makefile restructure to keep related variables in one place. . Trim the ancient bootstrapping options. . Add ipv6 to CATEGORIES if its enabled. [2] PR: 106129 [2] Submitted by: Janos Mohacsi [2] Pointed out by: pointyhat (via kris) [1] --- java/jdk14/files/patch-common::Defs-bsd.gmk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'java/jdk14/files/patch-common::Defs-bsd.gmk') diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk index aa4acca2b93f..fc86ed9b68a5 100644 --- a/java/jdk14/files/patch-common::Defs-bsd.gmk +++ b/java/jdk14/files/patch-common::Defs-bsd.gmk @@ -1,8 +1,8 @@ $FreeBSD$ ---- ../../j2se/make/common/Defs-bsd.gmk.orig Fri Oct 10 09:50:48 2003 -+++ ../../j2se/make/common/Defs-bsd.gmk Fri Oct 10 09:54:35 2003 -@@ -162,7 +162,7 @@ +--- ../../j2se/make/common/Defs-bsd.gmk.orig Fri Dec 8 11:50:23 2006 ++++ ../../j2se/make/common/Defs-bsd.gmk Fri Dec 8 11:58:29 2006 +@@ -192,7 +192,7 @@ ifeq ($(TRUE_PLATFORM), NetBSD) DEVTOOLS_PATH = /usr/pkg/bin/ else @@ -11,3 +11,12 @@ $FreeBSD$ endif # Allow the user to override the default value... ifdef ALT_DEVTOOLS_PATH +@@ -443,7 +443,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 = -- cgit v1.2.3