summaryrefslogtreecommitdiff
path: root/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
diff options
context:
space:
mode:
Diffstat (limited to 'java/jdk15/files/patch-deploy::common::Defs-bsd.gmk')
-rw-r--r--java/jdk15/files/patch-deploy::common::Defs-bsd.gmk18
1 files changed, 15 insertions, 3 deletions
diff --git a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
index a864ac0ef54f..66fa0007e4d0 100644
--- a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
+++ b/java/jdk15/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