diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:46:50 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:46:50 +0000 |
| commit | 7142c9db14e348b011c4b3ce44e4d2242b04ac9e (patch) | |
| tree | 0cb393b0302b31d62d0e984cd71a3bddd4909a13 /solenv/inc/tg_javav.mk | |
| parent | f1be793b1713436e0a355fa2c439367229a81c69 (diff) | |
INTEGRATION: CWS execshellmacrogone (1.8.530); FILE MERGED
2007/10/24 06:35:48 rene 1.8.530.1: #i79760# krs patches for supressing "Executing shell macro..." output
Diffstat (limited to 'solenv/inc/tg_javav.mk')
| -rw-r--r-- | solenv/inc/tg_javav.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk index 478e6cec5612..2f6864855f16 100644 --- a/solenv/inc/tg_javav.mk +++ b/solenv/inc/tg_javav.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_javav.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: kz $ $Date: 2006-07-05 21:58:32 $ +# last change: $Author: rt $ $Date: 2007-11-06 15:46:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,11 +47,11 @@ JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bi # 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 |