From 2c6c09301f111677c426ca4ba8cea7557344334f Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 21 Feb 2013 16:46:18 +0000 Subject: [PATCH] Java API: build system bugfixes. Signed-off-by: Christoph M. Wintersteiger --- scripts/mk_util.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/mk_util.py b/scripts/mk_util.py index 7fb14fa7f..5d2fb4e17 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -236,11 +236,11 @@ def find_java_home(): global JAVA_HOME if JAVA_HOME != None: if IS_WINDOWS: - ind = string.join(path, 'bin\java.exe') + ind = '%s%s' % (JAVA_HOME, '\\bin\\java.exe') else: - ind = string.join(path, 'bin/java') + ind = '%s%s' % (JAVA_HOME, '/bin/java') if not os.path.exists(ind): - raise MKException("Failed to detect java at '%s'.Possible solution: set JAVA_HOME with the path to JDK." % os.path.join(path)) + raise MKException("Failed to detect java at '%s'.Possible solution: set JAVA_HOME with the path to JDK." % os.path.join(JAVA_HOME)) else: return if is_verbose(): @@ -261,7 +261,7 @@ def find_java_home(): tmp = m.group(1).split(os.sep) path = string.join(tmp[:len(tmp) - 3], os.sep) if IS_WINDOWS: - ind = '%s%s' % (path, '\bin\java.exe') + ind = '%s%s' % (path, '\\bin\\java.exe') else: ind = '%s%s' % (path, '/bin/java') if os.path.exists(ind):