diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2007-08-05 20:39:49 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2007-08-05 20:39:49 +0000 |
| commit | 4d5c7602538b84c33564b815fa72eb9d9df9df21 (patch) | |
| tree | efc2ebc2871a752a96936699d197a99ad0cb5e67 /java/jdk16/files/patch-j2se-splashscreen-Makefile | |
| parent | . Forced commit to note repo copy of jdk15 to jdk16. (diff) | |
. A native port for JDK 1.6.0 (aka 6.0) Update 1.
Notes
Notes:
svn path=/head/; revision=197135
Diffstat (limited to 'java/jdk16/files/patch-j2se-splashscreen-Makefile')
| -rw-r--r-- | java/jdk16/files/patch-j2se-splashscreen-Makefile | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-j2se-splashscreen-Makefile b/java/jdk16/files/patch-j2se-splashscreen-Makefile new file mode 100644 index 000000000000..4b3da483367c --- /dev/null +++ b/java/jdk16/files/patch-j2se-splashscreen-Makefile @@ -0,0 +1,18 @@ +$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} + 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 |