INTEGRATION: CWS ooo11rc2 (1.5.98); FILE MERGED

2003/07/15 03:09:01 fa 1.5.98.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.

http://www.openoffice.org/issues/show_bug.cgi?id=16849

Contributor:
Kevin Hendricks

Dan
fa@ooo
This commit is contained in:
Jens-Heiner Rechtien
2003-07-16 17:09:05 +00:00
parent 0f417708ce
commit 4735cb1585

View File

@@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.5 $ # $Revision: 1.6 $
# #
# last change: $Author: vg $ $Date: 2003-04-17 13:53:20 $ # last change: $Author: hr $ $Date: 2003-07-16 18:09:05 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@@ -123,7 +123,7 @@ SLOFILES = \
$(SLO)$/visiturl.obj \ $(SLO)$/visiturl.obj \
$(SLO)$/htmltbl.obj $(SLO)$/htmltbl.obj
.IF "$(OS)"=="MACOSX" .IF "$(OS)$(CVER)"=="MACOSXC295"
SLOFILES += $(SLO)$/gcc_outl.obj SLOFILES += $(SLO)$/gcc_outl.obj
.ENDIF .ENDIF