1bb6af069e
. 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]
15 lines
510 B
Text
15 lines
510 B
Text
$FreeBSD$
|
|
|
|
--- ../../deploy/make/common/Defs-bsd.gmk.orig Sun Dec 10 18:30:50 2006
|
|
+++ ../../deploy/make/common/Defs-bsd.gmk Sun Dec 10 18:31:22 2006
|
|
@@ -13,8 +13,8 @@
|
|
JUMP_EXE = $(BIN_DIR)/javaws$(SUFFIX)
|
|
JUMP_EXE_DBG = $(BIN_DIR_DBG)/javaws$(DBG_SUFFIX)
|
|
PATH_SEP = /
|
|
-X11DIR = /usr/X11R6
|
|
-LOCALDIR = /usr/local
|
|
+X11DIR = $(X11BASE)
|
|
+LOCALDIR = $(LOCALBASE)
|
|
ifneq ($(TRUE_PLATFORM), NetBSD)
|
|
LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv
|
|
else
|