msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Now we even test in two different places for the JNI headers. Once for Linux and once for Mac OS. This is still not ideal since different Linux distributions might use different locations.

Browse Source
This commit is contained in:
krasimir
2016-02-17 14:52:48 +00:00
parent 9e3944951c
commit 8548979d1c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime/java/Makefile
View File

@@ -2,8 +2,9 @@ C_SOURCES = jpgf.c jsg.c jni_utils.c
JAVA_SOURCES = $(wildcard org/grammaticalframework/pgf/*.java) \ JAVA_SOURCES = $(wildcard org/grammaticalframework/pgf/*.java) \
$(wildcard org/grammaticalframework/sg/*.java) $(wildcard org/grammaticalframework/sg/*.java)
JNI_PATH = /usr/lib/jvm/default-java/include JNI_PATH = $(if $(wildcard /usr/lib/jvm/default-java/include/.*), /usr/lib/jvm/default-java/include, \
#JNI_PATH = /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ $(if $(wildcard /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/.*), /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers, \
$(error No JNI headers found)))
INSTALL_PATH = /usr/local/lib INSTALL_PATH = /usr/local/lib
LIBTOOL = $(if $(shell command -v glibtool 2>/dev/null), glibtool --tag=CC, libtool) LIBTOOL = $(if $(shell command -v glibtool 2>/dev/null), glibtool --tag=CC, libtool)