Merge pull request #65 from BenceJanosSzabo/master

[deliverable/titan.core.git] / Makefile.cfg

diff --git a/Makefile.cfg b/Makefile.cfg
index f4c5fb92b057e76e3c9037586036303d4ea450b7..f1f38d454ed55588d0771df9897c0d2a8e01cad1 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -1,9 +1,30 @@
 ###############################################################################
-# Copyright (c) 2000-2015 Ericsson Telecom AB
+# Copyright (c) 2000-2016 Ericsson Telecom AB
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   >
+#   Baji, Laszlo
+#   Balasko, Jeno
+#   Baranyi, Botond
+#   Beres, Szabolcs
+#   Delic, Adam
+#   Feher, Csaba
+#   Forstner, Matyas
+#   Kovacs, Ferenc
+#   Kremer, Peter
+#   Lovassy, Arpad
+#   Ormandi, Matyas
+#   Pandi, Krisztian
+#   Raduly, Csaba
+#   Szabados, Kristof
+#   Szabo, Janos Zoltan – initial implementation
+#   Szalai, Endre
+#   Zalanyi, Balazs Andor
+#
 ###############################################################################
 ifndef TOP
 $(error please define TOP)
@@ -67,7 +88,7 @@ JNI := yes
 
 # Path of the Java Developement Kit installation
 # (must be at least version  1.5.0_10)
-JDKDIR := /mnt/TTCN/Tools/jdk1.5.0_11
+JDKDIR := /usr/lib/jvm/default-java
 
 # Path of OpenSSL installation: (always required)
 OPENSSL_DIR := default