diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:05:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:05:37 +0000 |
| commit | 430276ca0df2a52396ee605805d52c1e05fae851 (patch) | |
| tree | d6aa87e6f97e2597436cf6cb12851d6e7579b3cf /solenv | |
| parent | b4a4005c64c528e96b361fb48d067ee1f67b4472 (diff) | |
INTEGRATION: CWS geordi2q14 (1.21.86); FILE MERGED
2004/01/30 11:36:37 hr 1.21.86.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/unx.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 46ddcf1270b5..ee86ac8ecd20 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -2,9 +2,9 @@ # # $RCSfile: unx.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: vg $ $Date: 2003-06-12 10:01:42 $ +# last change: $Author: hr $ $Date: 2004-02-02 19:05:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -164,10 +164,14 @@ OLE2DEF= .INCLUDE : unxaixp.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDI" +.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC295NETBSDI" .INCLUDE : unxbsdi.mk .ENDIF +.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC300NETBSDI" +.INCLUDE : unxbsdi2.mk +.ENDIF + .IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDS" .INCLUDE : unxbsds.mk .ENDIF |