diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-12-11 17:10:52 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-12-11 17:10:52 +0000 |
| commit | 1bb6af069e9022e2ed0f01e23ed25541d5f47c3a (patch) | |
| tree | 0c0e900d08b155640ddec294ebc33fb7d514ec0a /java/jdk16/files/patch-j2se::awt::mawt.gmk | |
| parent | - Respect X11BASE (diff) | |
. 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]
Notes
Notes:
svn path=/head/; revision=179502
Diffstat (limited to 'java/jdk16/files/patch-j2se::awt::mawt.gmk')
| -rw-r--r-- | java/jdk16/files/patch-j2se::awt::mawt.gmk | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-j2se::awt::mawt.gmk b/java/jdk16/files/patch-j2se::awt::mawt.gmk new file mode 100644 index 000000000000..703e594c9583 --- /dev/null +++ b/java/jdk16/files/patch-j2se::awt::mawt.gmk @@ -0,0 +1,26 @@ +$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) |