summary refs log tree commit diff
path: root/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
blob: 104ebc9252b4c9a32f3f4d6dc627c171ca868a6a (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
diff --git a/configure.ac b/configure.ac
index 5007bbd..335f3f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,6 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [
 ])
 
 AS_IF([test "x$use_bdjava_jar" = "xyes"], [
+    CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
 
     dnl check for ant
     AC_CHECK_PROG(HAVE_ANT, [ant], yes, no)
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index 1cb1bfe..94a175c 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -533,6 +533,7 @@ static char *_find_libbluray_jar0()
 #  ifdef __FreeBSD__
         "/usr/local/share/java/" BDJ_JARFILE,
 #  else
+        JARDIR "/" BDJ_JARFILE,
         "/usr/share/java/" BDJ_JARFILE,
         "/usr/share/libbluray/lib/" BDJ_JARFILE,
 #  endif