=== modified file 'runtime/zorba_modules/util-jvm/cmake_modules/FindJNI.cmake'
--- runtime/zorba_modules/util-jvm/cmake_modules/FindJNI.cmake	2012-05-14 16:15:48 +0000
+++ runtime/zorba_modules/util-jvm/cmake_modules/FindJNI.cmake	2012-06-13 08:34:54 +0000
@@ -27,7 +27,7 @@
 #  License text for the above reference.)
 
 # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
-MACRO(java_append_library_directories _var)
+MACRO(java_paths_expand_libarch _var)
     # Determine java arch-specific library subdir
     # Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
     # 1.6.0_18 + icedtea patches. However, it would be much better to base the
@@ -83,7 +83,7 @@
             LIST(APPEND ${_var} "${_path}")
         ENDIF(_path MATCHES "{libarch}")
     ENDFOREACH(_path)
-ENDMACRO(java_append_library_directories)
+ENDMACRO(java_paths_expand_libarch)
 
 GET_FILENAME_COMPONENT(java_install_version
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
@@ -96,7 +96,7 @@
 
 FILE(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME)
 
-JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+JAVA_PATHS_EXPAND_LIBARCH(JAVA_AWT_LIBRARY_DIRECTORIES
   ${_JAVA_HOME}/jre/lib/{libarch}
   ${_JAVA_HOME}/jre/lib
   ${_JAVA_HOME}/lib
@@ -114,6 +114,7 @@
   /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
   /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be removed according to #8821 ? Alex
   /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
+  /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch}
   /usr/lib/jvm/java-openjdk/jre/lib/{libarch}
   # Debian specific paths for default JVM
   /usr/lib/jvm/default-java/jre/lib/{libarch}
@@ -131,11 +132,13 @@
     )
 ENDFOREACH(dir)
 
-
-SET(JAVA_AWT_INCLUDE_DIRECTORIES
+SET(JAVA_AWT_INCLUDE_PATH
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+)
+
+JAVA_PATHS_EXPAND_LIBARCH(JAVA_AWT_INCLUDE_DIRECTORIES
   ${_JAVA_HOME}/include
   /usr/include 
   /usr/local/include
@@ -146,6 +149,7 @@
   /usr/lib/jvm/java-1.5.0-sun/include
   /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
   /usr/lib/jvm/java-6-openjdk/include
+  /usr/lib/jvm/java-6-openjdk-{libarch}/include
   /usr/local/share/java/include
   /usr/lib/j2sdk1.4-sun/include
   /usr/lib/j2sdk1.5-sun/include