summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:40:25 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:40:25 +0000
commitc7a6d9dd46b5ede0f7f3cde1ea7421d98618bf15 (patch)
tree56afee7f7baa5902febf50a7c379d64ce0c1dc56 /framework
parent164526be645ef508b552bfcff1dec1fae13d2dfa (diff)
INTEGRATION: CWS ooo11rc2 (1.3.56); FILE MERGED
2003/07/15 06:22:01 fa 1.3.56.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only. http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16868 Dan fa@ooo
Diffstat (limited to 'framework')
-rw-r--r--framework/test/threadtest/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk
index 6260feaed953..08ebbb7952aa 100644
--- a/framework/test/threadtest/makefile.mk
+++ b/framework/test/threadtest/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: hr $ $Date: 2003-03-25 18:22:04 $
+# last change: $Author: hr $ $Date: 2003-07-16 17:40:25 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -87,7 +87,7 @@ APP1OBJS= $(SLO)$/threadtest.obj \
# [ed] 6/16/02 Add the transaction manager library on OS X
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
APP1OBJS+= $(SLO)$/transactionmanager.obj
.ENDIF