diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-03-12 08:12:08 +0000 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-03-12 08:12:08 +0000 |
| commit | 5d7916772da3a4896855c8aae5ffcfcbe79ecf63 (patch) | |
| tree | 716771a6dce9216d1b2de1cc0e68bcf452da7842 /rules/jvisu.make | |
| parent | 5ce5811e9cd7ca14eb20c9e9af473ab00f3ddfcd (diff) | |
| download | ptxdist-5d7916772da3a4896855c8aae5ffcfcbe79ecf63.tar.gz ptxdist-5d7916772da3a4896855c8aae5ffcfcbe79ecf63.tar.xz | |
* rules/jvisu.make:
fail if PTXCONF_SETUP_JAVA_SDK is not set correctly
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10066 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/jvisu.make')
| -rw-r--r-- | rules/jvisu.make | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/rules/jvisu.make b/rules/jvisu.make index bf884b17f..d86b8a13a 100644 --- a/rules/jvisu.make +++ b/rules/jvisu.make @@ -14,11 +14,18 @@ # PACKAGES-$(PTXCONF_JVISU) += jvisu -ifeq ($(PTXCONF_JVISU)-$(shell which ant 2>/dev/null),y-) +ifdef PTXCONF_JVISU +ifeq ($(shell which ant 2>/dev/null),) $(warning *** ant is mandatory to build JVisu) $(warning *** please install ant) $(error ) endif +ifeq ($(shell test -x $(PTXCONF_SETUP_JAVA_SDK)/bin/java || echo no),no) + $(warning *** java is mandatory to build JVisu) + $(warning *** please run 'ptxdist setup' and set the path to the java sdk) + $(error ) +endif +endif # # Paths and names @@ -48,11 +55,6 @@ $(STATEDIR)/jvisu.extract: @$(call clean, $(JVISU_DIR)) @$(call extract, JVISU) @$(call patchin, JVISU) - - # FIXME: we cannot currently overwrite the JAVAPATH on the command line, - # so we tweak it here in a way that it works at least with Debian - sed -i -e "s,^JAVAPATH=.*$$,JAVAPATH=$(PTXCONF_SETUP_JAVA_SDK),g" $(JVISU_DIR)/build.properties - @$(call touch) # ---------------------------------------------------------------------------- |