From bb1e6ceadacd2b38826ed996e44cc45f3d8d1a41 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Wed, 8 Jun 2016 13:58:39 +0200 Subject: [PATCH] app_java: skip throwing error of missing java for make readme - controlled by DOCBUILD=yes --- modules/app_java/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/app_java/Makefile b/modules/app_java/Makefile index f3a40aef72e..c348ffd6ab6 100644 --- a/modules/app_java/Makefile +++ b/modules/app_java/Makefile @@ -24,7 +24,9 @@ LIBS += $(shell pkg-config libgcj --libs) -L$(JAVA_HOME)/lib -ljvm # At this point I don't see any universal method as explicit setting this variable at the compile phase. # -- ez ifeq ($(shell [ -d "${JAVA_HOME}" -a -f "$(JAVA_HOME)/include/jni.h" -a -f "$(JAVA_HOME)/lib/libjvm.so" ] && echo 1 || echo 0),0) - $(error Can't locate Java Development Kit. You have to specify environment JAVA_HOME to build app_java) +ifneq ($(DOCBUILD),yes) +$(error Cannot locate Java Development Kit. You have to specify environment JAVA_HOME to build app_java) +endif endif ifeq ($(OS), freebsd)