diff --git a/Makefile.cfg b/Makefile.cfg index f4c5fb92b057e76e3c9037586036303d4ea450b7..9d7fb0e38bc2e84380a39948967b7fa8c046d09f 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -67,7 +67,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 diff --git a/README.linux b/README.linux index 5534e3d457f965853d1949ac734072c889d9f896..f8450f7746f99375ebc85050ff87beab11ff7180 100644 --- a/README.linux +++ b/README.linux @@ -54,7 +54,6 @@ GEN_PDF := no - b) JNI enabled install JDK into /home/<user id>/jdk @@ -98,7 +97,7 @@ make install This will install Titan into /home/<user id>/titan.core/Install -7. Optionally , run function/regression tests +7. Optionally, run function/regression tests cd /home/<user id>/titan.core/function_test @@ -124,7 +123,5 @@ make run These tests might run for half an hour (regr.tests) to two hours (func.tests) -8. Optionally , copy Titan into its final directory. -From here on, you can continue with the Titan installation guide, see /Install/docs, -to set/change environment variables etc. - +8. Optionally, copy Titan into its final directory. +From here on, you can continue with the Titan installation guide, see /Install/docs, to set/change environment variables etc.