diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2002-07-02 16:40:39 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2002-07-02 16:40:39 +0000 |
| commit | 9d75e0bca20a9a932c4f1ba0b67084ee98543821 (patch) | |
| tree | a2f9e752942e6efad04f60e4513a09648ad11caf /solenv/inc/ant.mk | |
| parent | 68ffec629e11c1206b89c4f600b53498f259958d (diff) | |
default ANT_HOME if not set; reference needed jarfiles for ant build with ANT_HOME
Diffstat (limited to 'solenv/inc/ant.mk')
| -rw-r--r-- | solenv/inc/ant.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk index fa15cfbd3156..baeae7689349 100644 --- a/solenv/inc/ant.mk +++ b/solenv/inc/ant.mk @@ -20,7 +20,7 @@ J2EE_HOME=$(SOLARROOT)$/j2sdkee1.3 # --- ANT build environment --------------------------------------- -ANT_HOME=$(SOLARBINDIR) +ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/ant .IF "$(ANT_OPTIONAL)" =="" ANT_OPTIONAL=$(SOLARBINDIR)$/jakarta-ant-1.4.1-optional.jar @@ -28,7 +28,7 @@ ANT_OPTIONAL=$(SOLARBINDIR)$/jakarta-ant-1.4.1-optional.jar .IF "$(ANT_CLASSPATH)"=="" .IF "$(WDK3RDPARTY)"=="" -ANT_CLASSPATH:=$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ant.jar$(PATH_SEPERATOR)$(ANT_OPTIONAL)$(PATH_SEPERATOR)$(SOLARBINDIR)$/junit.jar +ANT_CLASSPATH:=$(ANT_HOME)$/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_HOME)$/xml-apis.jar$(PATH_SEPERATOR)$(ANT_HOME)$/ant.jar$(PATH_SEPERATOR)$(ANT_OPTIONAL)$(PATH_SEPERATOR)$(ANT_HOME)$/junit.jar .ELSE ANT_CLASSPATH:=$(CLASSDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(CLASSDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(CLASSDIR)$/ant.jar$(PATH_SEPERATOR)$(ANT_OPTIONAL)$(PATH_SEPERATOR)$(CLASSDIR)$/junit.jar .ENDIF |