From: Gergely Pilisi <gergely.pilisi@ericsson.com>
Date: Mon, 18 Apr 2016 07:31:19 +0000 (+0200)
Subject: Corrected JDKDIR path
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9e07d6a95a72ac44f372dc080fd607d9e0a751a1;p=deliverable%2Ftitan.core.git

Corrected JDKDIR path

Signed-off-by: Gergely Pilisi <gergely.pilisi@ericsson.com>
---

9e07d6a95a72ac44f372dc080fd607d9e0a751a1
diff --cc Makefile.cfg
index c27c9f0,f1f38d4..3d86498
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@@ -88,7 -88,7 +88,11 @@@ JNI := ye
  
  # Path of the Java Developement Kit installation
  # (must be at least version  1.5.0_10)
++<<<<<<< HEAD
 +JDKDIR := /usr/lib/jvm/default-java 
++=======
+ JDKDIR := /usr/lib/jvm/default-java
++>>>>>>> 318d000115c0c01e0d7077166c13a9ab3918e287
  
  # Path of OpenSSL installation: (always required)
  OPENSSL_DIR := default