diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2017-01-04 17:17:22 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2017-01-09 17:45:34 +0100 |
| commit | e3549623b1a4a5851728c00f946daff43b2ab7e0 (patch) | |
| tree | bf95cb377e72f98a4be47546ba0f1443b8ae33c4 | |
| parent | 11dfde6e3e0cbe66fd24efb1ec95474bf26321e5 (diff) | |
| download | mupdf-e3549623b1a4a5851728c00f946daff43b2ab7e0.tar.xz | |
java: Automatically determine openjdk path.
Also allow for overriding the decision by setting JAVA_HOME.
| -rw-r--r-- | platform/java/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/java/Makefile b/platform/java/Makefile index eb957663..8e12c87c 100644 --- a/platform/java/Makefile +++ b/platform/java/Makefile @@ -9,12 +9,12 @@ else BITS := $(shell getconf LONG_BIT) +JAVA_HOME ?= /usr/lib/jvm/default-java + MUPDF_JAVA := libmupdf_java$(BITS).so JAVA_CFLAGS := \ - -I /usr/lib/jvm/java-7-openjdk-i386/include \ - -I /usr/lib/jvm/java-7-openjdk-i386/include/linux \ - -I /usr/lib/jvm/java-7-openjdk-amd64/include \ - -I /usr/lib/jvm/java-7-openjdk-amd64/include/linux \ + -I $(JAVA_HOME)/include \ + -I $(JAVA_HOME)/include/linux \ $(shell pkg-config --cflags freetype2) \ $(shell pkg-config --cflags libcrypto) JAVA_LIBS := \ |