diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-04-07 03:27:34 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-04-07 03:27:34 +0000 |
| commit | e81e856fc6098f97aa3bf4fd90c1f94952213126 (patch) | |
| tree | 795e0052a57cab4c476e5782c34fafe6e64a8923 /java/jdk16/files/patch-deploy::common::Defs-bsd.gmk | |
| parent | Upgrade to 1.1.8. (diff) | |
. Update to 1.5.0 patchset 3.
Notes
Notes:
svn path=/head/; revision=158993
Diffstat (limited to 'java/jdk16/files/patch-deploy::common::Defs-bsd.gmk')
| -rw-r--r-- | java/jdk16/files/patch-deploy::common::Defs-bsd.gmk | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk index 6b8e9430f208..a864ac0ef54f 100644 --- a/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk +++ b/java/jdk16/files/patch-deploy::common::Defs-bsd.gmk @@ -1,20 +1,13 @@ $FreeBSD$ ---- ../../deploy/make/plugin/common/Defs-bsd.gmk 12 Aug 2005 01:06:25 -0000 1.5 -+++ ../../deploy/make/plugin/common/Defs-bsd.gmk 12 Sep 2005 03:26:43 -0000 -@@ -27,3 +27,15 @@ - ifdef ALT_MOZILLA_HEADERS_PATH - MOZILLA_HEADERS_PATH=$(ALT_MOZILLA_HEADERS_PATH) +--- ../../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 +@@ -29,7 +29,7 @@ endif -+ -+# Default NSPR_PATH and allow override. + + # Default NSPR_PATH and allow override. +-NSPR_PATH = /usr/local +NSPR_PATH = ${LOCALBASE} -+ifdef ALT_NSPR_PATH -+ NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH)) -+endif -+ -+# Default NSPR Headers directory -+NSPR_HEADERS_PATH=$(NSPR_PATH)/include/nspr -+ifdef ALT_NSPR_HEADERS_PATH -+ NSPR_HEADERS_PATH=$(ALT_NSPR_HEADERS_PATH) -+endif + ifdef ALT_NSPR_PATH + NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH)) + endif |