diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:57:38 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:57:38 +0000 |
| commit | 5ae2cd7392c02fb33330768b9e6875a791c50e9f (patch) | |
| tree | 4220b4f77aaeb4cdc5efe97a395b1b5e30ffde07 /solenv/inc/tg_compv.mk | |
| parent | de0f40263b3f6b78d45e348c8a77c1ea86c01b1b (diff) | |
INTEGRATION: CWS ause058 (1.17.330); FILE MERGED
2006/06/16 11:38:08 hjs 1.17.330.1: #i58351# more bash
Diffstat (limited to 'solenv/inc/tg_compv.mk')
| -rw-r--r-- | solenv/inc/tg_compv.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk index 15ac9cc23..f6b46b88b 100644 --- a/solenv/inc/tg_compv.mk +++ b/solenv/inc/tg_compv.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_compv.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: rt $ $Date: 2005-09-08 09:42:24 $ +# last change: $Author: kz $ $Date: 2006-07-05 21:57:38 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,19 +45,20 @@ COMNAME:= .IF "$(COM)"=="GCC" CFLAGSVERSION=-dumpversion CFLAGSVERSION_CMD=-dumpversion -CFLAGSNUMVERSION_CMD=-dumpversion |& $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk +CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk +#CFLAGSNUMVERSION_CMD=-dumpversion | 2>&1 $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk .ENDIF .IF "$(COM)"=="MSC" CFLAGSVERSION= -CFLAGSVERSION_CMD= |& $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk -CFLAGSNUMVERSION_CMD= |& $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk +CFLAGSVERSION_CMD= $(PIPEERROR) $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk +CFLAGSNUMVERSION_CMD= $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk .ENDIF .IF "$(COM)"=="C55" || "$(COM)"=="C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro" CFLAGSVERSION= -V -CFLAGSVERSION_CMD= -V |& $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk -CFLAGSNUMVERSION_CMD= -V |& $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk +CFLAGSVERSION_CMD= -V $(PIPEERROR) $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk +CFLAGSNUMVERSION_CMD= -V $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk .ENDIF .IF "$(COM)"=="C730" |