at 23.11-beta 27 lines 842 B view raw
1diff --git a/configure.ac b/configure.ac 2index 5007bbd..f46de1a 100644 3--- a/configure.ac 4+++ b/configure.ac 5@@ -253,7 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ 6 ]) 7 8 AS_IF([test "x$use_bdjava_jar" = "xyes"], [ 9- 10+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" 11 dnl check for ant 12 AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) 13 AS_IF([test "x$HAVE_ANT" = "xno"], [ 14diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c 15index 1cb1bfe..f3711c2 100644 16--- a/src/libbluray/bdj/bdj.c 17+++ b/src/libbluray/bdj/bdj.c 18@@ -533,6 +533,9 @@ static char *_find_libbluray_jar0() 19 # ifdef __FreeBSD__ 20 "/usr/local/share/java/" BDJ_JARFILE, 21 # else 22+# ifdef JARDIR 23+ JARDIR "/" BDJ_JARFILE, 24+# endif 25 "/usr/share/java/" BDJ_JARFILE, 26 "/usr/share/libbluray/lib/" BDJ_JARFILE, 27 # endif