projects
/
yaz4j-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore .project/.classpath
[yaz4j-moved-to-github.git]
/
libyaz4j
/
build.sh
diff --git
a/libyaz4j/build.sh
b/libyaz4j/build.sh
index
9b15b74
..
d4687ad
100755
(executable)
--- a/
libyaz4j/build.sh
+++ b/
libyaz4j/build.sh
@@
-1,16
+1,12
@@
#!/bin/bash
#!/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`
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
g++ -fPIC -I"include" -I"$JNI_DIR" -I"$JNI_DIR/linux" ${YAZ_CFLAGS} -c -Wall -o obj/libyaz4j.o src/libyaz4j.cpp