Index: inc/scp/udk_basefiles.scp
===================================================================
RCS file: /cvs/udk/product/inc/scp/udk_basefiles.scp,v
retrieving revision 1.9.2.1.2.1
diff -u -r1.9.2.1.2.1 udk_basefiles.scp
--- inc/scp/udk_basefiles.scp	7 Jun 2002 18:15:12 -0000	1.9.2.1.2.1
+++ inc/scp/udk_basefiles.scp	17 Jun 2002 00:55:58 -0000
@@ -48,7 +48,7 @@
 File gid_File_Lib_Sal
     BIN_FILE_BODY;
     #ifdef UNX
-		Name	= STRING(CONCAT6(libsal.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+		Name	= STRING(CONCAT6(libsal,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
 		Name	= STRING(CONCAT3(sal,UDK_MAJOR,.dll));
     #endif
@@ -60,7 +60,7 @@
 Shortcut gid_Shortcut_Lib_Sal
     FileID		= gid_File_Lib_Sal;
     Dir			= GCFG_BINARY_DIR;
-    Name		= STRING(CONCAT2(libsal.so.,UDK_MAJOR));
+    Name		= STRING(CONCAT2(libsal,UNXSUFFIX,UDK_MAJOR));
     Styles		= (NETWORK,RELATIVE);
 End
 #endif
@@ -68,7 +68,7 @@
 File gid_File_Lib_Sto
     BIN_FILE_BODY;
     #ifdef UNX
-		Name	= STRING(CONCAT6(libstore.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+		Name	= STRING(CONCAT6(libstore,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
 		Name	= STRING(CONCAT3(store,UDK_MAJOR,.dll));
     #endif
@@ -80,7 +80,7 @@
 Shortcut gid_Shortcut_Lib_Sto
     FileID      = gid_File_Lib_Sto;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(CONCAT2(libstore.so.,UDK_MAJOR));
+    Name        = STRING(CONCAT4(libstore,UNXSUFFIX,.,UDK_MAJOR));
     Styles      = (NETWORK,RELATIVE);
 End
 #endif
@@ -88,7 +88,7 @@
 File gid_File_Lib_Reg
     BIN_FILE_BODY;
     #ifdef UNX
-		Name	= STRING(CONCAT6(libreg.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+		Name	= STRING(CONCAT6(libreg,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
 		Name	= STRING(CONCAT3(reg,UDK_MAJOR,.dll));
     #endif
@@ -100,7 +100,7 @@
 Shortcut gid_Shortcut_Lib_Reg
     FileID      = gid_File_Lib_Reg;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(CONCAT2(libreg.so.,UDK_MAJOR));
+    Name        = STRING(CONCAT4(libreg,UNXSUFFIX,.,UDK_MAJOR));
     Styles      = (NETWORK,RELATIVE);
 End
 #endif
@@ -108,7 +108,7 @@
 File gid_File_Lib_Cppu
     BIN_FILE_BODY;
     #ifdef UNX
-		Name	= STRING(CONCAT6(libcppu.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+		Name	= STRING(CONCAT6(libcppu,UNXSUFFIX,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
 		Name	= STRING(CONCAT3(cppu,UDK_MAJOR,.dll));
     #endif
@@ -120,7 +120,7 @@
 Shortcut gid_Shortcut_Lib_Cppu
     FileID      = gid_File_Lib_Cppu;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(CONCAT2(libcppu.so.,UDK_MAJOR));
+    Name        = STRING(CONCAT4(libcppu,UNXSUFFIX,.,UDK_MAJOR));
     Styles      = (NETWORK,RELATIVE);
 End
 #endif
@@ -142,7 +142,7 @@
     Styles		= (PACKED, SETUPZIP);
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-        Name	= STRING(CONCAT3(libsalhelper,UDK_MAJOR,COMID.so));
+        Name	= STRING(CONCAT3(libsalhelper,UDK_MAJOR,COMID=,UNXSUFFIX));
     #else		
         Name	= STRING(CONCAT5(salhelper,UDK_MAJOR,COMID,.,dll));
     #endif
@@ -154,7 +154,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-		Name	= "libcpld.so";
+		Name	= STRING(CONCAT2("libcpld",UNXSUFFIX));
     #else
 		Name	= "cpld.dll";
     #endif
@@ -166,7 +166,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-		Name    = "libdefreg.so";
+		Name    = STRING(CONCAT2("libdefreg",UNXSUFFIX));
     #else
         Name    = "defreg.dll";
     #endif
@@ -178,7 +178,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-		Name	= "libimpreg.so";
+		Name	= STRING(CONCAT2("libimpreg",UNXSUFFIX));
     #else
 		Name	= "impreg.dll";
     #endif
@@ -190,7 +190,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-        Name	= "librdbtdp.so";
+        Name	= STRING(CONCAT2("librdbtdp",UNXSUFFIX));
 	#else
         Name	= "rdbtdp.dll";
     #endif
@@ -202,7 +202,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-		Name	= "libsimreg.so";
+		Name	= STRING(CONCAT2("libsimreg",UNXSUFFIX));
 	#else
 		Name	= "simreg.dll";
 	#endif
@@ -214,7 +214,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-		Name	= "libsmgr.so";
+		Name	= STRING(CONCAT2("libsmgr",UNXSUFFIX));
 	#else
 		Name	= "smgr.dll";
 	#endif
@@ -226,7 +226,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-		Name	= "libtdmgr.so";
+		Name	= STRING(CONCAT2("libtdmgr",UNXSUFFIX));
 	#else
 		Name	= "tdmgr.dll";
 	#endif
@@ -249,7 +249,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-	Name		= "libstm.so";
+	Name		= STRING(CONCAT2("libstm",UNXSUFFIX));
 	#else
 	Name		= "stm.dll";
 	#endif
@@ -261,7 +261,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-		Name	= "libtcv.so";
+		Name	= STRING(CONCAT2("libtcv",UNXSUFFIX));
 	#else
 		Name	= "tcv.dll";
 	#endif
Index: inc/scp/udk_bridgesfiles.scp
===================================================================
RCS file: /cvs/udk/product/inc/scp/udk_bridgesfiles.scp,v
retrieving revision 1.5.6.2
diff -u -r1.5.6.2 udk_bridgesfiles.scp
--- inc/scp/udk_bridgesfiles.scp	18 Mar 2002 00:55:10 -0000	1.5.6.2
+++ inc/scp/udk_bridgesfiles.scp	17 Jun 2002 00:56:00 -0000
@@ -96,6 +96,18 @@
 
 #endif
 
+#ifdef MACOSX
+
+File gid_File_Lib_Gcc2_Uno
+        BIN_FILE_BODY;
+        Styles                  = (PACKED);
+        Name            = "libgcc2_uno.dylib";
+		Dir				= GCFG_BINARY_DIR;
+End
+
+#endif
+
+
 #ifdef SOLARIS
 
 File gid_File_Lib_Sunpro5_Uno
Index: inc/scp/udk_completefiles.scp
===================================================================
RCS file: /cvs/udk/product/inc/scp/udk_completefiles.scp,v
retrieving revision 1.2
diff -u -r1.2 udk_completefiles.scp
--- inc/scp/udk_completefiles.scp	30 Aug 2001 12:33:41 -0000	1.2
+++ inc/scp/udk_completefiles.scp	17 Jun 2002 00:56:00 -0000
@@ -6,7 +6,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libcorefl.so";
+        Name            = STRING(CONCAT2(libcorefl,UNXSUFFIX));
         #else
         Name            = "corefl.dll";
         #endif
@@ -18,7 +18,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libinsp.so";
+        Name            = STRING(CONCAT2(libinsp,UNXSUFFIX));
         #else
         Name            = "insp.dll";
         #endif
@@ -30,7 +30,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libinv.so";
+        Name            = STRING(CONCAT2(libinv,UNXSUFFIX));
         #else
         Name            = "inv.dll";
         #endif
@@ -42,7 +42,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libinvadp.so";
+        Name            = STRING(CONCAT2(libinvadp,UNXSUFFIX));
         #else
         Name            = "invadp.dll";
         #endif
@@ -54,7 +54,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libnamingservice.so";
+        Name            = STRING(CONCAT2(libnamingservice,UNXSUFFIX));
         #else
         Name            = "namingservice.dll";
         #endif
@@ -66,7 +66,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libproxyfac.so";
+        Name            = STRING(CONCAT2(libproxyfac,UNXSUFFIX));
         #else
         Name            = "proxyfac.dll";
         #endif
@@ -78,7 +78,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libtcv.so";
+        Name            = STRING(CONCAT2(libtcv,UNXSUFFIX));
         #else
         Name            = "tcv.dll";
         #endif
@@ -91,7 +91,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libstm.so";
+        Name            = STRING(CONCAT2(libstm,UNXSUFFIX));
         #else
         Name            = "stm.dll";
         #endif
Index: inc/scp/udk_javafiles.scp
===================================================================
RCS file: /cvs/udk/product/inc/scp/udk_javafiles.scp,v
retrieving revision 1.1
diff -u -r1.1 udk_javafiles.scp
--- inc/scp/udk_javafiles.scp	27 Jun 2001 14:13:02 -0000	1.1
+++ inc/scp/udk_javafiles.scp	17 Jun 2002 00:56:00 -0000
@@ -6,7 +6,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libjavaloader.so";
+        Name            = STRING(CONCAT2(libjavaloader,UNXSUFFIX));
         #else
         Name            = "javaloader.dll";
         #endif
@@ -18,7 +18,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libjen.so";
+        Name            = STRING(CONCAT2(libjen,UNXSUFFIX));
         #else
         Name            = "jen.dll";
         #endif
@@ -28,7 +28,7 @@
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libjava_uno.so";
+        Name            = STRING(CONCAT2(libjava_uno,UNXSUFFIX));
         #else
         Name            = "java_uno.dll";
         #endif
Index: inc/scp/udk_remotefiles.scp
===================================================================
RCS file: /cvs/udk/product/inc/scp/udk_remotefiles.scp,v
retrieving revision 1.3
diff -u -r1.3 udk_remotefiles.scp
--- inc/scp/udk_remotefiles.scp	21 Aug 2001 14:47:49 -0000	1.3
+++ inc/scp/udk_remotefiles.scp	17 Jun 2002 00:56:00 -0000
@@ -5,7 +5,7 @@
         Styles          = (PACKED);
         Dir             = GCFG_BINARY_DIR;
 	#ifdef UNX
-        Name            = STRING(CONCAT6(librmcxt.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+        Name            = STRING(CONCAT8(librmcxt,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
         Name            = STRING(CONCAT3(rmcxt,UDK_MAJOR,.dll));
     #endif
@@ -15,7 +15,7 @@
 Shortcut gid_Shortcut_Lib_Rmcxt
     FileID      = gid_File_Lib_Rmcxt;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(CONCAT2(librmcxt.so.,UDK_MAJOR));
+    Name        = STRING(CONCAT4(librmcxt,UNXSUFFIX,.,UDK_MAJOR));
     Styles      = (NETWORK,RELATIVE);
 End
 #endif
@@ -25,7 +25,7 @@
         Styles          = (PACKED,DONT_OVERWRITE);
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libiiop_uno.so";
+        Name            = STRING(CONCAT2(libiiop_uno,UNXSUFFIX));
         #else
         Name            = "iiop_uno.dll";
         #endif
@@ -37,7 +37,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libremotebridge.so";
+        Name            = STRING(CONCAT2(libremotebridge,UNXSUFFIX));
         #else
         Name            = "remotebridge.dll";
         #endif
@@ -49,7 +49,7 @@
         Styles          = (PACKED);
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "liburp_uno.so";
+        Name            = STRING(CONCAT2(liburp_uno,UNXSUFFIX));
         #else
         Name            = "urp_uno.dll";
         #endif
@@ -61,7 +61,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libacceptor.so";
+        Name            = STRING(CONCAT2(libacceptor,UNXSUFFIX));
         #else
         Name            = "acceptor.dll";
         #endif
@@ -73,7 +73,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libbrdgfctr.so";
+        Name            = STRING(CONCAT2(libbrdgfctr,UNXSUFFIX));
         #else
         Name            = "brdgfctr.dll";
         #endif
@@ -85,7 +85,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libconnectr.so";
+        Name            = STRING(CONCAT2(libconnectr,UNXSUFFIX));
         #else
         Name            = "connectr.dll";
         #endif
@@ -97,7 +97,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libuuresolver.so";
+        Name            = STRING(CONCAT2(libuuresolver,UNXSUFFIX));
         #else
         Name            = "uuresolver.dll";
         #endif
Index: util/makefile.mk
===================================================================
RCS file: /cvs/udk/product/util/makefile.mk,v
retrieving revision 1.64.2.1
diff -u -r1.64.2.1 makefile.mk
--- util/makefile.mk	11 Jun 2002 15:09:39 -0000	1.64.2.1
+++ util/makefile.mk	17 Jun 2002 00:56:01 -0000
@@ -58,10 +58,17 @@
 # UNX ONLY
 #####################
 DLLOUT=$(SOLARLIBDIR)
+.IF "$(OS)"=="MACOSX"
+MY_DLLPOSTFIX=.dylib
+MY_VERSION_DLLPOSTFIX=.dylib.$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO)
+MY_VERSION_LINKPOSTFIX=.dylib.$(UDK_MAJOR)
+MY_VERSION_LINKTARGETPOSTFIX=.$(UDK_MINOR).$(UDK_MICRO)
+.ELSE
 MY_DLLPOSTFIX=.so
 MY_VERSION_DLLPOSTFIX=.so.$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO)
 MY_VERSION_LINKPOSTFIX=.so.$(UDK_MAJOR)
 MY_VERSION_LINKTARGETPOSTFIX=.$(UDK_MINOR).$(UDK_MICRO)
+.ENDIF
 MY_MAJOR=
 MY_DLLPREFIX=lib
 EXEPOSTFIX=
@@ -204,9 +211,10 @@
 #.ENDIF
 
 STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+
 .IF "$(STLPORT4)" != ""
 # in OOo build environment
-.IF "($STLPORT4)" != "NO_STLPORT4"
+.IF "$(STLPORT4)" != "NO_STLPORT4"
 .IF "$(OS)"=="WNT"
 STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
 .ELSE   # "$(OS)"=="WNT"
@@ -473,6 +481,19 @@
 $(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/udkapi.rdb
 	$(GNUCOPY) -p $(BINOUT)$/udkapi.rdb $@
 
+# [ed] 6/16/02 The OS X build is complaining about not finding libstlport_gcc.dylib within the
+# solver output directory...I'm not sure what's going on, but let's just insert a rule to copy
+# it there and hope nothing bad happens as a result.
+
+.IF "$(OS)"=="MACOSX"
+.IF "$(STLPORT4)"!=""
+.IF "$(STLPORT4)"!="NO_STLPORT4"
+$(SOLARVER)$/$(UPD)$/$(INPATH)$/lib$/$(STLPORTLIBNAME) : $(STLPORT4)$/lib/$(STLPORTLIBNAME)
+    $(GNUCOPY) -p $(STLPORT4)$/lib/$(STLPORTLIBNAME) $(SOLARVER)$/$(UPD)$/$(INPATH)$/lib$/$(STLPORTLIBNAME)
+.ENDIF
+.ENDIF
+.ENDIF
+
 .IF "$(STLPORTDEST)" != ""
 #OOo build environment
 $(STLPORTDEST) : $(STLPORTOUT)
@@ -538,7 +559,7 @@
 	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@
 
 $(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST)
-	$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@
+	-$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@
 
 $(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST)
 	+-rm -f $@ >& $(NULLDEV)
@@ -550,7 +571,7 @@
 	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@
 
 $(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README
-	$(GNUCOPY) -p $(PRJ)$/examples$/README $@
+	-$(GNUCOPY) -p $(PRJ)$/examples$/README $@
 
 $(DESTDIRIDL)$/% : $(IDLOUT)$/%
 	+-rm -f $@