diff options
| author | Hilko Bengen <bengen@hilluzination.de> | 2012-02-02 21:54:10 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-02-10 15:45:55 +0000 |
| commit | cf0f5711068f59c25e4988e0fec1287925a6aceb (patch) | |
| tree | edf527dbd71e156fa25d2854560daf12987d3dd8 | |
| parent | a2308fbf7ab94fe1dab96b740b20f3d0ee104870 (diff) | |
| download | libguestfs-cf0f5711068f59c25e4988e0fec1287925a6aceb.tar.gz libguestfs-cf0f5711068f59c25e4988e0fec1287925a6aceb.tar.xz libguestfs-cf0f5711068f59c25e4988e0fec1287925a6aceb.zip | |
java: Make use of JAR_INSTALL_DIR, JNI_INSTALL_DIR
(cherry picked from commit 016ae77e6c2331560a3716ea1ebae82f122b4909)
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | java/Makefile.am | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ada1db6e..529fb619 100644 --- a/configure.ac +++ b/configure.ac @@ -939,10 +939,13 @@ if test "x$with_java_home" != "xno"; then esac AC_MSG_RESULT([$JAVAC_FLAGS]) - dnl Where to install jarfiles. - dnl XXX How to make it configurable? - JAR_INSTALL_DIR=\${prefix}/share/java - JNI_INSTALL_DIR=\${libdir} + dnl Where to install jarfiles, jnifiles + if test -z $JAR_INSTALL_DIR; then + JAR_INSTALL_DIR=\${prefix}/share/java + fi + if test -z $JNI_INSTALL_DIR; then + JNI_INSTALL_DIR=\${libdir} + fi dnl JNI version. jni_major_version=`echo "$VERSION" | awk -F. '{print $1}'` diff --git a/java/Makefile.am b/java/Makefile.am index ef78773d..d9db6f43 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -67,7 +67,8 @@ libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files) # JNI source. -lib_LTLIBRARIES = libguestfs_jni.la +jnilib_LTLIBRARIES = libguestfs_jni.la +jnilibdir = $(JNI_INSTALL_DIR) libguestfs_jni_la_SOURCES = \ com_redhat_et_libguestfs_GuestFS.h \ com_redhat_et_libguestfs_GuestFS.c |