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/tg_javav.mk | |
| parent | 9d7d35bce00ec0b2676d0428872300cc257e3288 (diff) | |
CWS-TOOLING: integrate CWS kick4nt
Diffstat (limited to 'solenv/inc/tg_javav.mk')
| -rw-r--r-- | solenv/inc/tg_javav.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk index 0f329e6076ed..e39533f9b6f6 100644 --- a/solenv/inc/tg_javav.mk +++ b/solenv/inc/tg_javav.mk @@ -29,7 +29,7 @@ # #************************************************************************* -JAVAVERMK:=$(INCCOM)$/java_ver.mk +JAVAVERMK:=$(INCCOM)/java_ver.mk .INCLUDE .IGNORE : $(JAVAVERMK) @@ -38,16 +38,16 @@ JAVAVERMK:=$(INCCOM)$/java_ver.mk .IF "$(SOLAR_JAVA)"!="" JFLAGSVERSION=-version -JFLAGSVERSION_CMD=-version $(PIPEERROR) $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk -JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk +JFLAGSVERSION_CMD=-version $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk +JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk # that's the version known by the specific # java version -JAVAVER:=$(shell @-$(JAVA_HOME)$/bin$/java $(JFLAGSVERSION_CMD)) +JAVAVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSVERSION_CMD)) # and a computed integer for comparing # each point seperated token blown up to 4 digits -JAVANUMVER:=$(shell @-$(JAVA_HOME)$/bin$/java $(JFLAGSNUMVERSION_CMD)) +JAVANUMVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSNUMVERSION_CMD)) .ELSE # "$(SOLAR_JAVA)"!="" JAVAVER=0.0.0 |