mirror of
https://git.freebsd.org/ports.git
synced 2025-06-17 10:40:46 -04:00
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]
26 lines
738 B
Text
26 lines
738 B
Text
$FreeBSD$
|
|
|
|
--- ../../j2se/make/sun/awt/mawt.gmk.orig Sun Dec 10 21:49:45 2006
|
|
+++ ../../j2se/make/sun/awt/mawt.gmk Sun Dec 10 21:50:27 2006
|
|
@@ -132,9 +132,9 @@
|
|
ifeq ($(ARCH_DATA_MODEL), 64)
|
|
LIBXT = -lXt
|
|
else
|
|
- LIBXT = /usr/X11R6/lib/libXt.a
|
|
- LIBSM = /usr/X11R6/lib/libSM.a
|
|
- LIBICE = /usr/X11R6/lib/libICE.a
|
|
+ LIBXT = $(X11BASE)/lib/libXt.a
|
|
+ LIBSM = $(X11BASE)/lib/libSM.a
|
|
+ LIBICE = $(X11BASE)/lib/libICE.a
|
|
endif
|
|
endif
|
|
else
|
|
@@ -229,7 +229,7 @@
|
|
$(EVENT_MODEL)
|
|
|
|
ifeq ($(LINUX_OR_BSD), true)
|
|
- CPPFLAGS += -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
|
|
+ CPPFLAGS += -I$(X11BASE)/include -I$(X11BASE)/include/X11/extensions
|
|
endif
|
|
|
|
ifeq ($(PLATFORM), solaris)
|