From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 28 Oct 2013 20:39:55 +0000 (+0100)
Subject: Fix the check for Java build
X-Git-Tag: v0.3.4~6
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/orte.git/commitdiff_plain/5d9a3377a2bf1b76e568dceb13e7ac477de4e583?hp=1edcc1dfd8c518abd301f170f381f2a5a2501a48

Fix the check for Java build
---

diff --git a/Makefile.git b/Makefile.git
index f4f69d7..738af0c 100644
--- a/Makefile.git
+++ b/Makefile.git
@@ -39,12 +39,14 @@ check-autotools.real:
 	../configure $(CONFIGURE_FLAGS)
 	make
 
-check-java.real: JAVAC=$(shell readlink -f $(which javac))
+check-java.real: JAVAC=$(shell readlink -f $(shell which javac))
 check-java.real: JAVA_HOME=$(JAVAC:%/bin/javac=%)
 check-java.real:
+	test -d "$(JAVA_HOME)"
 	../configure --with-java=$(JAVA_HOME)
 	$(MAKE)
-	false # Java is not compiled - either fix it or update README
+	ant -f ../orte/java
+	test -f ../orte/java/lib/orte.jar
 
 check-android:
 	android update project -p orte/libaorte