summary refs log tree commit diff
path: root/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
blob: d3dec2936c50aa86745635aa0b98d0d26ac05bb0 (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
25
26
27
diff --git a/configure.ac b/configure.ac
index 5007bbd..f46de1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,7 +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)
     AS_IF([test "x$HAVE_ANT" = "xno"], [
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index 1cb1bfe..f3711c2 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -533,6 +533,9 @@ static char *_find_libbluray_jar0()
 #  ifdef __FreeBSD__
         "/usr/local/share/java/" BDJ_JARFILE,
 #  else
+#    ifdef JARDIR
+        JARDIR "/" BDJ_JARFILE,
+#    endif
         "/usr/share/java/" BDJ_JARFILE,
         "/usr/share/libbluray/lib/" BDJ_JARFILE,
 #  endif