diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-08-02 15:03:30 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-08-02 15:03:30 +0000 |
| commit | f0451c8bbe9c00799c680f59d319db333e38f531 (patch) | |
| tree | d2035cec425bfcd3bc40118452385f046a39d6cc /rules/jvisu.make | |
| parent | 6c27ab30990342514f6e46c8d57c71c2ec3302e6 (diff) | |
| download | ptxdist-f0451c8bbe9c00799c680f59d319db333e38f531.tar.gz ptxdist-f0451c8bbe9c00799c680f59d319db333e38f531.tar.xz | |
fix JVisu paths
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@3007 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/jvisu.make')
| -rw-r--r-- | rules/jvisu.make | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rules/jvisu.make b/rules/jvisu.make index 5be8540bf..5ff5d41a0 100644 --- a/rules/jvisu.make +++ b/rules/jvisu.make @@ -58,7 +58,7 @@ $(STATEDIR)/jvisu.extract: $(jvisu_extract_deps) # 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 - perl -i -p -e "s,^JAVAPATH=.*,JAVAPATH=/usr,g" $(JVISU_DIR)/build.properties + perl -i -p -e "s,^JAVAPATH=.*,JAVAPATH=$(PTXCONF_SETUP_JAVA_SDK),g" $(JVISU_DIR)/build.properties touch $@ @@ -75,8 +75,9 @@ jvisu_prepare_deps = \ $(STATEDIR)/jvisu.extract \ $(STATEDIR)/virtual-xchain.install -JVISU_PATH = PATH=$(CROSS_PATH) +JVISU_PATH = PATH=$(PTXCONF_SETUP_JAVA_SDK)/bin:$(CROSS_PATH) JVISU_ENV = $(CROSS_ENV) +JVISU_ENV += JAVA_HOME=$(PTXCONF_SETUP_JAVA_SDK) $(STATEDIR)/jvisu.prepare: $(jvisu_prepare_deps) @$(call targetinfo, $@) |