summaryrefslogtreecommitdiff
path: root/src/runtime/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/runtime/java')
-rw-r--r--src/runtime/java/INSTALL12
-rw-r--r--src/runtime/java/Makefile2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/runtime/java/INSTALL b/src/runtime/java/INSTALL
index 6d97dd279..c0e91a355 100644
--- a/src/runtime/java/INSTALL
+++ b/src/runtime/java/INSTALL
@@ -1,10 +1,12 @@
-Before compiling the Java binding you first need to have the C runtime
+Before compiling the Java binding you first need to have the C runtime
compiled and installed. You also need to find where your jni.h header
is installed. It is part of the Java JDK, but it might be placed
-in different places on different platforms. The path to the jni.h
-header should be assigned to the JNI_PATH variable in the beginning
-of the Makefile that you will find in the root directory of
-the binding. Once this is done type:
+in different places on different platforms.
+The Makefile in this directory will try to figure out the location of
+jni.h, but if it doesn't succeed you should add it manually to the
+JNI_INCLUDES variable in the beginning of the Makefile.
+
+Once this is done type:
$ make
$ make install
diff --git a/src/runtime/java/Makefile b/src/runtime/java/Makefile
index b7a7264cc..02083ddac 100644
--- a/src/runtime/java/Makefile
+++ b/src/runtime/java/Makefile
@@ -3,7 +3,7 @@ JAVA_SOURCES = $(wildcard org/grammaticalframework/pgf/*.java) \
$(wildcard org/grammaticalframework/sg/*.java)
JNI_INCLUDES = $(if $(wildcard /usr/lib/jvm/default-java/include/.*), -I/usr/lib/jvm/default-java/include -I/usr/lib/jvm/default-java/include/linux, \
- $(if $(wildcard /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/.*), /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers, \
+ $(if $(wildcard /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/.*), -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers, \
$(if $(wildcard /Library/Java/Home/include/.*), -I/Library/Java/Home/include/ -I/Library/Java/Home/include/darwin, \
$(error No JNI headers found))))