Changeset 15435 for trunk/x86-headers

Timestamp:

Aug 11, 2012, 8:58:41 PM (9 years ago)

Author:

gb

Message:

Look for JVMINCLUDE in a couple of plausible places.

File:

• trunk/x86-headers/jni/C/populate.sh (modified) (1 diff)

trunk/x86-headers/jni/C/populate.sh

@@ -1 +1 @@
 #!/bin/sh
-JVMINCLUDE=/usr/lib/jvm/java-6-openjdk-i386/include
+if [ -e /usr/lib/jvm/java-6-openjdk-i386/include ]; then
+ JVMINCLUDE=/usr/lib/jvm/java-6-openjdk-i386/include
+elif [ -e /usr/lib/jvm/java-6-openjdk/include ]; then
+ JVMINCLUDE=/usr/lib/jvm/java-6-openjdk/include
+else
+ echo Fix JVMINCLUDE and try again ...
+fi
 ARCH_SUBDIR=i386-linux-gnu
 CFLAGS="-isystem /usr/include/$ARCH_SUBDIR -m32 -I${JVMINCLUDE}/linux";export CFLAGS