summaryrefslogtreecommitdiff
path: root/solenv/inc/ant.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/inc/ant.mk')
-rw-r--r--solenv/inc/ant.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index 646146a734bb..c197cd15df8d 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -10,8 +10,15 @@ J2EE_HOME=$(SOLARROOT)$/j2sdkee1.2
# --- ANT build environment ---------------------------------------
-.IF "$(ANT_CLASSPATH)" ==""
-ANT_CLASSPATH:=$(SOLARBINDIR)$/ant.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$/$(SOLARBINDIR)$/xerces.jar
+.IF "$(ANT_OPTIONAL)" ==""
+ANT_OPTIONAL=$(SOLARBINDIR)$/jakarta-ant-1.3-optional.jar
+.ENDIF
+
+.IF "$(ANT_CLASSPATH)"==""
+ANT_CLASSPATH:=$(SOLARBINDIR)$/ant.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$/$(SOLARBINDIR)$/xerces.jar$(PATH_SEPERATOR)$(ANT_OPTIONAL)
+.IF "$(ANTPRJ_BOOTSTRAP)"==""
+ANT_CLASSPATH!:=$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/antprj.jar
+.ENDIF
.ENDIF
ANT=java -Xmx1024m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME)