3e4ed01146
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav)
30 lines
1.1 KiB
Text
30 lines
1.1 KiB
Text
$FreeBSD$
|
|
|
|
--- ../../j2se/make/sun/awt/mawt.gmk.orig Sun Jul 29 23:03:29 2007
|
|
+++ ../../j2se/make/sun/awt/mawt.gmk Sun Jul 29 23:03:29 2007
|
|
@@ -131,11 +131,11 @@
|
|
LIBXT = -lXt
|
|
else
|
|
# Allows for builds on Debian GNU Linux, X11 is in a different place
|
|
- LIBXT = $(firstword $(wildcard /usr/X11R6/lib/libXt.a) \
|
|
+ LIBXT = $(firstword $(wildcard ${LOCALBASE}/lib/libXt.a) \
|
|
$(wildcard /usr/lib/libXt.a))
|
|
- LIBSM = $(firstword $(wildcard /usr/X11R6/lib/libSM.a) \
|
|
+ LIBSM = $(firstword $(wildcard ${LOCALBASE}/lib/libSM.a) \
|
|
$(wildcard /usr/lib/libSM.a))
|
|
- LIBICE = $(firstword $(wildcard /usr/X11R6/lib/libICE.a) \
|
|
+ LIBICE = $(firstword $(wildcard ${LOCALBASE}/lib/libICE.a) \
|
|
$(wildcard /usr/lib/libICE.a))
|
|
endif
|
|
endif
|
|
@@ -227,8 +227,8 @@
|
|
endif
|
|
|
|
ifeq ($(PLATFORM), bsd)
|
|
- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
|
|
- -I/usr/X11R6/include
|
|
+ CPPFLAGS += -I${LOCALBASE}/include/X11/extensions \
|
|
+ -I${LOCALBASE}/include
|
|
endif
|
|
|
|
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
|