X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=libyaz4j%2Fbuild.sh;h=d4687adf8c2e6911be9f23826ce61b9811fd0d33;hb=e1d54d118cce837805e62c7005c4f85ee2872920;hp=9b15b74919269da8ac3edf49efb418dc46ea2895;hpb=f1dc0de045f5d44f2f97d44e96139ac712fb359c;p=yaz4j-moved-to-github.git

diff --git a/libyaz4j/build.sh b/libyaz4j/build.sh
index 9b15b74..d4687ad 100755
--- a/libyaz4j/build.sh
+++ b/libyaz4j/build.sh
@@ -1,16 +1,12 @@
 #!/bin/bash
-
-# You may need to do something like this:
-#	env JAVA_HOME=/usr/lib/jvm/java-6-sun ./build.sh
-
-JNI_DIR=${JAVA_HOME}/include
+JNI_DIR=${JAVA_HOME:-/usr/lib/jvm/java-6-sun}/include
 set -x
 YAZ_CONFIG=yaz-config
 YAZ_PREFIX=`${YAZ_CONFIG} --prefix`
 YAZ_CFLAGS=`${YAZ_CONFIG} --cflags`
 YAZ_LIBS=`${YAZ_CONFIG} --libs`
 
-swig -I"include" -I"${YAZ_PREFIX}/include" -outdir ../src/org/yaz4j/jni -package org.yaz4j.jni -o src/libyaz4j.cpp -c++ -java libyaz4j.i
+swig -I"include" -I"${YAZ_PREFIX}/include" -outdir ../src/main/java/org/yaz4j/jni -package org.yaz4j.jni -o src/libyaz4j.cpp -c++ -java libyaz4j.i
 
 g++ -fPIC -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" ${YAZ_CFLAGS} -c -Wall -o obj/libyaz4j.o src/libyaz4j.cpp