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-deploy-oji-adapter-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-deploy-oji-adapter-Makefile')
| -rw-r--r-- | java/jdk16/files/patch-deploy-oji-adapter-Makefile | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-deploy-oji-adapter-Makefile b/java/jdk16/files/patch-deploy-oji-adapter-Makefile new file mode 100644 index 000000000000..71126c7066b1 --- /dev/null +++ b/java/jdk16/files/patch-deploy-oji-adapter-Makefile @@ -0,0 +1,21 @@ +$FreeBSD$ +--- ../../deploy/make/plugin/adapter/oji-adapter/Makefile.orig Sun Jul 29 23:03:29 2007 ++++ ../../deploy/make/plugin/adapter/oji-adapter/Makefile Sun Jul 29 23:03:29 2007 +@@ -44,7 +44,7 @@ + LIB_LOCATION=$(OUTPUTDIR)/plugin/$(LIBARCH)/ns7 + dummy:=$(shell $(MKDIR) -p $(LIB_LOCATION)) + +-X11DIR = /usr/X11R6 ++X11DIR = ${X11BASE} + + ifeq ($(PLATFORM), solaris) + LDLIBS = -lX11 -ldl -lCrun -lc +@@ -60,7 +60,7 @@ + + ifeq ($(PLATFORM), bsd) + JNIDIR = $(OUTPUTDIR)/include/$(OS_NAME) +-INTLDIR = /usr/local ++INTLDIR = ${LOCALBASE} + INTLHDRDIR = $(INTLDIR)/include + else + JNIDIR = $(OUTPUTDIR)/include/$(PLATFORM) |