ports/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
Greg Lewis 1bb6af069e . 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]
2006-12-11 17:10:52 +00:00

25 lines
651 B
Text

$FreeBSD$
--- ../../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)
ifdef ALT_NSPR_PATH
NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH))
endif