diff options
Diffstat (limited to 'QMTest/TestSCons.py')
| -rw-r--r-- | QMTest/TestSCons.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 360a799..de4a39b 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -698,13 +698,13 @@ class TestSCons(TestCommon): import sys if not version: version='' - frame = '/System/Library/Frameworks/JavaVM.framework/Headers/jni.h' + jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Headers/jni.h', + '/usr/lib/jvm/default-java/include/jni.h'] else: - frame = '/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version - jni_dirs = ['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version, - '/usr/java/jdk%s*/include/jni.h'%version, - frame, - ] + jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version] + jni_dirs.extend(['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version, + '/usr/lib/jvm/java-%s*-openjdk/include/jni.h'%version, + '/usr/java/jdk%s*/include/jni.h'%version]) dirs = self.paths(jni_dirs) if not dirs: return None |