summaryrefslogtreecommitdiff
path: root/solenv/inc/antsettings.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/inc/antsettings.mk')
-rw-r--r--solenv/inc/antsettings.mk16
1 files changed, 6 insertions, 10 deletions
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index aa240afe08fb..26ccfa6fe3bc 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -33,23 +33,19 @@
.IF "$(SOLAR_JAVA)"!=""
.IF "$(ANT_HOME)" == ""
-ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/apache-ant-1.7.0
+ANT_HOME*:=$(COMMON_BUILD_TOOLS)/apache-ant-1.7.0
.EXPORT : ANT_HOME
.ENDIF
-ANT_LIB*:=$(ANT_HOME)$/lib
+ANT_LIB*:=$(ANT_HOME)/lib
-ANT_CLASSPATH:=$(ANT_LIB)$/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)$/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)$/ant.jar
+ANT_CLASSPATH:=$(ANT_LIB)/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar
# PATH_SEPERATOR won't work here as it is defined
# as ; for wondows (all shells)
-#PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)$(PATH)
-.IF "$(USE_SHELL)"=="4nt"
-PATH!:=$(ANT_HOME)$/bin;$(PATH)
-.ELSE # "$(USE_SHELL)"=="4nt"
-PATH!:=$(ANT_HOME)$/bin:$(PATH)
-.ENDIF # "$(USE_SHELL)"=="4nt"
+#PATH!:=$(ANT_HOME)/bin$(PATH_SEPERATOR)$(PATH)
+PATH!:=$(ANT_HOME)/bin:$(PATH)
-ANT*:=$(ANT_HOME)$/bin$/ant
+ANT*:=$(ANT_HOME)/bin/ant
ANT_BUILDFILE*=build.xml
.IF "$(ANT_DEBUG)"==""