GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-24 02:12:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

resolve a conflict that was for some reason commited in src/runtime/java/Makefile

Browse Source
This commit is contained in:
krasimir
2017-01-24 09:36:39 +00:00
parent 1dbba8f377
commit f6ecf0ce56
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/java/Makefile
View File

@@ -2,16 +2,10 @@ 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)
v v v v v v v
JNI_PATH = /usr/lib/jvm/default-java/include
=============
#JNI_PATH = /usr/lib/jvm/default-java/include
JNI_PATH = /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/
*************
JNI_PATH = $(if $(wildcard /usr/lib/jvm/default-java/include/.*), /usr/lib/jvm/default-java/include, \ JNI_PATH = $(if $(wildcard /usr/lib/jvm/default-java/include/.*), /usr/lib/jvm/default-java/include, \
$(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/.*), /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers, \
$(error No JNI headers found))) $(error No JNI headers found)))
^ ^ ^ ^ ^ ^ ^
INSTALL_PATH = /usr/local/lib INSTALL_PATH = /usr/local/lib
LIBTOOL = glibtool --tag=CC LIBTOOL = glibtool --tag=CC