diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2007-10-28 20:47:42 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2007-10-28 20:47:42 +0000 |
| commit | 4db6f92b05f514b7a058320c58a46d8db73abad6 (patch) | |
| tree | 25a018e79c425318f40110c50f2fd7e5222347dc /java/jdk16/files/patch-j2se-splashscreen-Makefile | |
| parent | - Prevent perllocal.pod from being written (diff) | |
. Update to patchset 2 (based on 1.6.0_02 aka 6u2)
Notes
Notes:
svn path=/head/; revision=202232
Diffstat (limited to 'java/jdk16/files/patch-j2se-splashscreen-Makefile')
| -rw-r--r-- | java/jdk16/files/patch-j2se-splashscreen-Makefile | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/java/jdk16/files/patch-j2se-splashscreen-Makefile b/java/jdk16/files/patch-j2se-splashscreen-Makefile index 4b3da483367c..ec629682d5ae 100644 --- a/java/jdk16/files/patch-j2se-splashscreen-Makefile +++ b/java/jdk16/files/patch-j2se-splashscreen-Makefile @@ -1,18 +1,13 @@ $FreeBSD$ ---- ../../j2se/make/sun/splashscreen/Makefile.orig Sun Jul 29 23:03:30 2007 -+++ ../../j2se/make/sun/splashscreen/Makefile Sun Jul 29 23:03:30 2007 -@@ -46,11 +46,11 @@ - ifneq ($(PLATFORM), windows) - CFLAGS += -DWITH_X11 - ifeq ($(PLATFORM), bsd) -- ICONV_DIR=/usr/local -+ ICONV_DIR=${LOCALBASE} +--- ../../j2se/make/sun/splashscreen/Makefile.orig Fri Oct 26 10:33:27 2007 ++++ ../../j2se/make/sun/splashscreen/Makefile Fri Oct 26 10:35:59 2007 +@@ -49,7 +49,7 @@ + ifeq ($(OS_VENDOR), NetBSD) + ICONV_DIR = /usr/pkg + else +- ICONV_DIR = /usr/local ++ ICONV_DIR = ${LOCALBASE} + endif CPPFLAGS += -I$(OPENWIN_HOME)/include \ -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(ICONV_DIR)/include -- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext -L$(ICONV_DIR)/lib -liconv $(LIBM) -pthread -+ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext -L$(ICONV_DIR)/lib -liconv $(LIBM) ${PTHREAD_LIBS} - else - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread |