diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-11 15:45:58 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-11 16:32:40 +0000 |
commit | 889b6a6e00994099327b9b874c93add6f88baa0a (patch) | |
tree | fca4258fc460c589fa9307f601cd6d3c150d3798 /rhino/makefile.mk | |
parent | 98a10b638a645776d14049b8fb12a87b80b6eb3b (diff) |
Related: rhbz#753201 fedora ant+java-1.5.0-gcj won't resolve env variables
Diffstat (limited to 'rhino/makefile.mk')
-rw-r--r-- | rhino/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 91117d9338bd..577d0300c495 100644 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -58,9 +58,9 @@ FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION) .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar +BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar .ELSE -BUILD_ACTION=TARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" $(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar +BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar .ENDIF # --- Targets ------------------------------------------------------ |