From dfdd705f1b5736d41c19d4c92acdb2cd45e93445 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon, 2 Feb 2004 17:50:29 +0000
Subject: [PATCH] INTEGRATION: CWS geordi2q14 (1.11.10); FILE MERGED 2004/01/30
 12:57:09 hr 1.11.10.1: #111934#: merge CWS ooo111fix2

---
 store/util/makefile.mk | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/store/util/makefile.mk b/store/util/makefile.mk
index 732ea5578225..2fdf6834e069 100644
--- a/store/util/makefile.mk
+++ b/store/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.11 $
+#   $Revision: 1.12 $
 #
-#   last change: $Author: hjs $ $Date: 2003-08-18 14:47:54 $
+#   last change: $Author: hr $ $Date: 2004-02-02 18:50:29 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -102,14 +102,10 @@ SHL1STDLIBS=	$(SALLIB)
 
 # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
 .IF "$(COMID)"=="gcc3"
-.IF "$(OS)"=="FREEBSD"
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX"
 SHL1STDLIBS+= 	-lsupc++
 .ELSE
-.IF "$(OS)"!="MACOSX"
 SHL1STDLIBS+= 	-lsupc++ -lgcc_s
-.ELSE
-SHL1STDLIBS+= 	-lsupc++
-.ENDIF
 .ENDIF
 .ENDIF