diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
| commit | ae0228cdb340de85f42c25024986ce0e557503a3 (patch) | |
| tree | 55439cdf267c7cd8eef9a0ce6fa0c1775b3a133f /solenv/inc/ant.mk | |
| parent | 9d7d35bce00ec0b2676d0428872300cc257e3288 (diff) | |
CWS-TOOLING: integrate CWS kick4nt
Diffstat (limited to 'solenv/inc/ant.mk')
| -rw-r--r-- | solenv/inc/ant.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk index 155e6e53761c..6c7d9b269db1 100644 --- a/solenv/inc/ant.mk +++ b/solenv/inc/ant.mk @@ -35,8 +35,8 @@ JDK_VERSION=140 JAVA_HOME=$(JDK14PATH) -PATH!:=$(JDK14PATH)$/bin$(PATH_SEPERATOR)$(PATH) -XCLASSPATH:=$(JDK14PATH)$/jre/lib/rt.jar +PATH!:=$(JDK14PATH)/bin$(PATH_SEPERATOR)$(PATH) +XCLASSPATH:=$(JDK14PATH)/jre/lib/rt.jar CLASSPATH:=$(XCLASSPATH) .ENDIF @@ -51,13 +51,13 @@ CLASSPATH:=$(XCLASSPATH) .INCLUDE : target.mk -CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)$/lib$/tools.jar +CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)/lib/tools.jar .EXPORT : CLASSPATH .EXPORT : PATH # --- TARGETS ----------------------------------------------------- -$(CLASSDIR)$/solar.properties : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg $(SOLARENV)$/inc/ant.properties +$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg $(SOLARENV)/inc/ant.properties @echo Making: $@ @echo solar.build=$(BUILD) > $@ @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@ @@ -66,7 +66,7 @@ $(CLASSDIR)$/solar.properties : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/m @echo solar.sourceversion=$(SOURCEVERSION) >> $@ @echo solar.udkstamp=$(UDKSTAMP) >> $@ @echo solar.extstamp=$(EXTSTAMP) >> $@ - @cat $(DMAKEROOT)$/../ant.properties >> $@ + @cat $(DMAKEROOT)/../ant.properties >> $@ ANTBUILD .PHONY: $(ANT) $(ANT_FLAGS) |