From f6ecf0ce56a64869fb142aa78bd969efd0f60a5c Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Tue, 24 Jan 2017 09:36:39 +0000
Subject: [PATCH] resolve a conflict that was for some reason commited in
 src/runtime/java/Makefile

---
 src/runtime/java/Makefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/runtime/java/Makefile b/src/runtime/java/Makefile
index 52342ac27..68855274b 100644
--- a/src/runtime/java/Makefile
+++ b/src/runtime/java/Makefile
@@ -2,16 +2,10 @@ C_SOURCES = jpgf.c jsg.c jni_utils.c
 JAVA_SOURCES = $(wildcard org/grammaticalframework/pgf/*.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, \
            $(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
 LIBTOOL = glibtool --tag=CC