diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:32:57 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:32:57 +0000 |
| commit | 64a4cc4a41016e7fb030cc4223fd5e369e286f73 (patch) | |
| tree | c09490ea58951c34b5f9bc7e582196341c7825f9 /cppu | |
| parent | eb55c07e5587487f7dfe08ebcf769b6ce273bd07 (diff) | |
INTEGRATION: CWS os2port03 (1.15.8); FILE MERGED
2008/07/16 13:41:35 obr 1.15.8.2: RESYNC: (1.15-1.16); FILE MERGED
2008/01/29 14:30:59 ydario 1.15.8.1: Build system update for os2.
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/util/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 3b6cbabae..826463931 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # # This file is part of OpenOffice.org. # @@ -76,8 +76,10 @@ DEF1NAME=$(SHL1TARGET) SHL2TARGET := $(NAMEpurpenv_helper) DEF2NAME := $(SHL2TARGET) -.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" +.IF "$(GUI)$(COM)"=="WNTGCC" SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map +.ELIF "$(GUI)"=="OS2" +SHL2VERSIONMAP:=uno_purpenvhelperwntgcc.map .ELSE SHL2VERSIONMAP:=$(SHL2TARGET).map .ENDIF # "$(GUI)$(COM)"=="WNTGCC" |