diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-03-15 08:10:44 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-03-15 08:10:44 +0000 |
| commit | 673306cb4952b0abc7622672e4530d8161bd3e97 (patch) | |
| tree | 39b423f20f9e9e1e04026af64ccf9523df40e4a9 /solenv/inc/ant.mk | |
| parent | 7914ddfd416ad515809e6322fbe50933d4e7bde7 (diff) | |
INTEGRATION: CWS gcj3 (1.26.78); FILE MERGED
2005/03/08 20:22:29 cmc 1.26.78.1: #i44359# reorder -D in ant for gcj
Diffstat (limited to 'solenv/inc/ant.mk')
| -rw-r--r-- | solenv/inc/ant.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk index b50c1bd5c690..e2a5eaceb8fd 100644 --- a/solenv/inc/ant.mk +++ b/solenv/inc/ant.mk @@ -2,9 +2,9 @@ # # $RCSfile: ant.mk,v $ # -# $Revision: 1.26 $ +# $Revision: 1.27 $ # -# last change: $Author: obo $ $Date: 2005-01-25 15:15:02 $ +# last change: $Author: obo $ $Date: 2005-03-15 09:10:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -116,11 +116,13 @@ ANT_OPT=on .ENDIF .IF "$(JDK)"=="gcj" -ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \ - -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \ - -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \ - -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \ - -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs -Dbuild.compiler=gcj +JAVA_HOME= +.EXPORT : JAVA_HOME +ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \ + -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \ + -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \ + -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \ + -Dcommon.doc=$(SOLARCOMMONDOCDIR) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs .ELSE ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \ -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \ |