From e3549623b1a4a5851728c00f946daff43b2ab7e0 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Wed, 4 Jan 2017 17:17:22 +0100 Subject: java: Automatically determine openjdk path. Also allow for overriding the decision by setting JAVA_HOME. --- platform/java/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'platform/java') 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 := \ -- cgit v1.2.3