summaryrefslogtreecommitdiff
path: root/solenv/inc/tg_compv.mk
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-07-02 12:43:49 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-07-02 12:43:49 +0000
commit2dc80d8e1f0e27cd4ca39212820da764d1a74606 (patch)
tree4b3addfcd9dd351e1b73927e9a05f60202ee5abe /solenv/inc/tg_compv.mk
parent34de3e0235651c960e11d10badd42de1a2a53b06 (diff)
INTEGRATION: CWS ooo11rc (1.12.2); FILE MERGED
2003/06/19 07:40:21 mh 1.12.2.1: add: fixes for Solaris C55, #i15800#
Diffstat (limited to 'solenv/inc/tg_compv.mk')
-rw-r--r--solenv/inc/tg_compv.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 09c06d7d3e30..b8910f3937a3 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: tg_compv.mk,v $
#
-# $Revision: 1.12 $
+# $Revision: 1.13 $
#
-# last change: $Author: vg $ $Date: 2003-06-12 10:00:41 $
+# last change: $Author: vg $ $Date: 2003-07-02 13:43:49 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -81,7 +81,7 @@ CFLAGSVERSION_CMD= |& $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk
CFLAGSNUMVERSION_CMD= |& $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk
.ENDIF
-.IF "$(COM)"=="C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
+.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
@@ -131,7 +131,7 @@ SHORTSTDCPP3="5"
.ENDIF
.ENDIF
-.IF "$(COM)" == "C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
+.IF "$(COM)"=="C55" || "$(COM)" == "C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
.IF "$(CCNUMVER)">="00050002"
COMID=C52
COMNAME=sunpro5