[libbluray-devel] Install libbluray.jar to $datadir/java/

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Tue Dec 24 14:25:31 2013 +0200| [27a6bf7563144b4e3f119854e2e5604987cd9531] | committer: hpi1

Install libbluray.jar to $datadir/java/

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=27a6bf7563144b4e3f119854e2e5604987cd9531
---

 src/Makefile.am         |    2 +-
 src/libbluray/bdj/bdj.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index ed45f31..5634952 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -127,7 +127,7 @@ pkginclude_HEADERS = \
 	util/log_control.h
 
 if USING_BDJAVA
-jardir=$(libdir)/libbluray/
+jardir=$(datadir)/java/
 jar_DATA=$(top_builddir)/src/.libs/libbluray.jar
 
 $(top_builddir)/src/.libs/libbluray.jar: all-local
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index 7ee0fd2..be68d10 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -198,8 +198,7 @@ static const char *_find_libbluray_jar(void)
 #ifdef _WIN32
         "" BDJ_JARFILE,
 #else
-        "/usr/lib/libbluray/" BDJ_JARFILE,
-        "/usr/share/libbluray/" BDJ_JARFILE,
+        "/usr/share/java/" BDJ_JARFILE,
 #endif
     };