forked from I2P_Developers/i2p.i2p
minor updates to jbigi/jcpuid scripts
- use my find-java-home stub script when building jcupid - move find-java-home to core/c - add support for ArchLinux to find-java-home
This commit is contained in:
@@ -25,7 +25,7 @@ mkdir -p lib bin/local
|
||||
VER=4.3.2
|
||||
|
||||
# If JAVA_HOME isn't set, try to figure it out on our own
|
||||
[ -z $JAVA_HOME ] && . ./find-java-home
|
||||
[ -z $JAVA_HOME ] && . ../find-java-home
|
||||
if [ ! -f "$JAVA_HOME/include/jni.h" ]; then
|
||||
echo "ERROR: Cannot find jni.h! Looked in \"$JAVA_HOME/include/jni.h\"" >&2
|
||||
echo "Please set JAVA_HOME to a java home that has the JNI" >&2
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
CC="gcc"
|
||||
|
||||
# If JAVA_HOME isn't set we'll try to figure it out
|
||||
[ -z $JAVA_HOME ] && . ./find-java-home
|
||||
[ -z $JAVA_HOME ] && . ../find-java-home
|
||||
if [ ! -f "$JAVA_HOME/include/jni.h" ]; then
|
||||
echo "Cannot find jni.h! Looked in '$JAVA_HOME/include/jni.h'"
|
||||
echo "Please set JAVA_HOME to a java home that has the JNI"
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
UNIXTYPE=$(uname -s | tr "[A-Z]" "[a-z]")
|
||||
if [ $UNIXTYPE = "freebsd" ]; then
|
||||
if [ -d /usr/local/openjdk6 ]; then
|
||||
JAVA_HOME="/usr/local/openjdk6"
|
||||
elif [ -d /usr/local/openjdk7 ]; then
|
||||
JAVA_HOME="/usr/local/openjdk7"
|
||||
fi
|
||||
elif [ $UNIXTYPE = "openbsd" ]; then
|
||||
if [ -d /usr/local/jdk-1.7.0 ]; then
|
||||
JAVA_HOME="/usr/local/jdk-1.7.0"
|
||||
fi
|
||||
elif [ $UNIXTYPE = "netbsd" ]; then
|
||||
if [ -d /usr/pkg/java/openjdk7 ]; then
|
||||
JAVA_HOME="/usr/pkg/java/openjdk7"
|
||||
fi
|
||||
elif [ $UNIXTYPE = "linux" ] && [ -e /etc/debian_version ]; then
|
||||
if [ -d /usr/lib/jvm/default-java ]; then
|
||||
JAVA_HOME="/usr/lib/jvm/default-java"
|
||||
fi
|
||||
elif [ $UNIXTYPE = "darwin" ]; then
|
||||
JAVA_HOME=$(/usr/libexec/java_home)
|
||||
fi
|
||||
|
||||
export JAVA_HOME
|
||||
Reference in New Issue
Block a user