projects
/
deliverable
/
titan.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
318d000
)
Corrected JDKDIR path
author
Gergely Pilisi
<gergely.pilisi@ericsson.com>
Mon, 18 Apr 2016 07:31:19 +0000
(09:31 +0200)
committer
Gergely Pilisi
<gergely.pilisi@ericsson.com>
Mon, 18 Apr 2016 07:31:19 +0000
(09:31 +0200)
Signed-off-by: Gergely Pilisi <gergely.pilisi@ericsson.com>
Makefile.cfg
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.cfg
b/Makefile.cfg
index f1f38d454ed55588d0771df9897c0d2a8e01cad1..3d864981c084290401b957a8caa509436c834bca 100644
(file)
--- a/
Makefile.cfg
+++ b/
Makefile.cfg
@@
-88,7
+88,11
@@
JNI := yes
# 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
This page took
0.04054 seconds
and
5
git commands to generate.