summaryrefslogtreecommitdiff
path: root/src/runtime/java/Makefile
diff options
context:
space:
mode:
authorodanoburu <bcclaro@gmail.com>2018-05-23 11:22:46 -0300
committerodanoburu <bcclaro@gmail.com>2018-05-23 11:22:46 -0300
commitc8b1cb715e48665f3550ae1ccb41a9e521f6557b (patch)
treec9921a1064486db3478e42c37e3c453aa3042342 /src/runtime/java/Makefile
parent1c7e99cdca020ccb1e55b067961813a7752eba3b (diff)
parent10df5a7269721ab0807ec7a0fe4b75cd1bb16d87 (diff)
Merge remote-tracking branch 'upstream/master' into por
Diffstat (limited to 'src/runtime/java/Makefile')
-rw-r--r--src/runtime/java/Makefile2
1 files changed, 1 insertions, 1 deletions
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))))