Skip to content

Commit

Permalink
app_java: skip throwing error of missing java for make readme
Browse files Browse the repository at this point in the history
- controlled by DOCBUILD=yes

(cherry picked from commit bb1e6ce)
(cherry picked from commit 6f9f6ae)
(cherry picked from commit 690462c)
  • Loading branch information
miconda committed Jul 4, 2016
1 parent 7afd55d commit 311602d
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion modules/app_java/Makefile
Expand Up @@ -26,7 +26,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)
Expand Down

0 comments on commit 311602d

Please sign in to comment.