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::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/jdk16/files/patch-deploy::common::Defs-bsd.gmk')
| -rw-r--r-- | java/jdk16/files/patch-deploy::common::Defs-bsd.gmk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk index a864ac0ef54f..66fa0007e4d0 100644 --- a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk +++ b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk @@ -1,13 +1,25 @@ $FreeBSD$ ---- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Tue Mar 28 22:20:28 2006 -+++ ../../deploy/make/plugin/common/Defs-bsd.gmk Tue Mar 28 22:20:45 2006 +--- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig Sun Dec 10 11:49:51 2006 ++++ ../../deploy/make/plugin/common/Defs-bsd.gmk Sun Dec 10 21:44:53 2006 +@@ -9,9 +9,9 @@ + + # Default MOZILLA_PATH and allow override. + ifeq ($(TRUE_PLATFORM), OpenBSD) +-MOZILLA_PATH = /usr/local ++MOZILLA_PATH = $(LOCALBASE) + else +-MOZILLA_PATH = /usr/X11R6 ++MOZILLA_PATH = $(X11BASE) + endif + ifdef ALT_MOZILLA_PATH + MOZILLA_PATH = $(subst //,/,$(ALT_MOZILLA_PATH)) @@ -29,7 +29,7 @@ endif # Default NSPR_PATH and allow override. -NSPR_PATH = /usr/local -+NSPR_PATH = ${LOCALBASE} ++NSPR_PATH = $(LOCALBASE) ifdef ALT_NSPR_PATH NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH)) endif |