Libguestfs - Feb 2012 - [PATCH] java: Rename JNI target, use JNI_INSTALL_DIR as provided through configure

This allows us to install the shared object to a different (e.g.
/usr/lib/jni) with less pain.
---
 java/Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/java/Makefile.am b/java/Makefile.am
index ef78773..d9db6f4 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
-- 
1.7.9

On 02/02/2012 10:25 PM, Hilko Bengen wrote:
> This allows us to install the shared object to a different (e.g.
> /usr/lib/jni) with less pain.
> ---
>   java/Makefile.am |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/java/Makefile.am b/java/Makefile.am
> index ef78773..d9db6f4 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
Grepping for JNI_INSTALL_DIR in my java directory gives:

Makefile:JNI_INSTALL_DIR = ${libdir}
Makefile.in:JNI_INSTALL_DIR = @JNI_INSTALL_DIR@

so this looks like a no-op in the default case. ACK.

Matt
-- 
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team

GPG ID:  D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490