Index: inc/gcfg.inc
===================================================================
RCS file: /cvs/installation/scp/inc/gcfg.inc,v
retrieving revision 1.41.4.1
diff -u -r1.41.4.1 gcfg.inc
--- inc/gcfg.inc	1 Jun 2002 05:38:44 -0000	1.41.4.1
+++ inc/gcfg.inc	23 Sep 2002 22:42:00 -0000
@@ -256,6 +256,10 @@
 #define CONCAT5( x, y, z, a, b )	 		DOCONCAT5(x,y,z,a,b)
 #define DOCONCAT6( x, y, z, a, b, c )		x##y##z##a##b##c
 #define CONCAT6( x, y, z, a, b, c )			DOCONCAT6(x,y,z,a,b,c)
+#define DOCONCAT7( x, y, z, a, b, c, d )		x##y##z##a##b##c##d
+#define CONCAT7( x, y, z, a, b, c, d )			DOCONCAT7(x,y,z,a,b,c,d)
+#define DOCONCAT8( x, y, z, a, b, c, d, e )		x##y##z##a##b##c##d##e
+#define CONCAT8( x, y, z, a, b, c, d, e )			DOCONCAT8(x,y,z,a,b,c,d,e)
 
 /* --------------------------------------------------*/
 
@@ -284,8 +288,13 @@
 /* --------------------------------------------------*/
 
 #ifdef UNX
-#define LIBNAME(name)			   			STRING(CONCAT5(lib,name,SUPD,DLLSUFFIX,.so))
-#define LIBSHORTNAME(name)                  STRING(CONCAT4(lib,name,DLLSUFFIX,.so))
+#ifdef MACOSX
+#define UNXSUFFIX .dylib
+#else
+#define UNXSUFFIX .so
+#endif
+#define LIBNAME(name)			   			STRING(CONCAT5(lib,name,SUPD,DLLSUFFIX,UNXSUFFIX))
+#define LIBSHORTNAME(name)                  STRING(CONCAT4(lib,name,DLLSUFFIX,UNXSUFFIX))
 #define FILTER_LIBNAME(name)	   			LIBNAME(name)
 #define EXENAME(name)			  			STRING(name)
 #define PROFILENAME(name)		  			STRING(CONCAT2(name,rc))
Index: source/calc/files_calc.scp
===================================================================
RCS file: /cvs/installation/scp/source/calc/files_calc.scp,v
retrieving revision 1.14
diff -u -r1.14 files_calc.scp
--- source/calc/files_calc.scp	16 Oct 2001 14:27:08 -0000	1.14
+++ source/calc/files_calc.scp	23 Sep 2002 22:42:01 -0000
@@ -93,7 +93,7 @@
 #ifdef WNT
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
Index: source/chart/files_chart.scp
===================================================================
RCS file: /cvs/installation/scp/source/chart/files_chart.scp,v
retrieving revision 1.11
diff -u -r1.11 files_chart.scp
--- source/chart/files_chart.scp	27 Jun 2001 14:30:38 -0000	1.11
+++ source/chart/files_chart.scp	23 Sep 2002 22:42:01 -0000
@@ -93,7 +93,7 @@
 #ifdef WNT
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
Index: source/draw/files_draw.scp
===================================================================
RCS file: /cvs/installation/scp/source/draw/files_draw.scp,v
retrieving revision 1.12
diff -u -r1.12 files_draw.scp
--- source/draw/files_draw.scp	16 Oct 2001 14:26:36 -0000	1.12
+++ source/draw/files_draw.scp	23 Sep 2002 22:42:01 -0000
@@ -93,7 +93,7 @@
 #ifdef WNT
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
Index: source/fonts/files_fonts.scp
===================================================================
RCS file: /cvs/installation/scp/source/fonts/files_fonts.scp,v
retrieving revision 1.38
diff -u -r1.38 files_fonts.scp
--- source/fonts/files_fonts.scp	12 Dec 2001 11:02:18 -0000	1.38
+++ source/fonts/files_fonts.scp	23 Sep 2002 22:42:01 -0000
@@ -155,7 +155,7 @@
 #ifdef WNT
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
Index: source/global/setupzip.scp
===================================================================
RCS file: /cvs/installation/scp/source/global/setupzip.scp,v
retrieving revision 1.65.4.2
diff -u -r1.65.4.2 setupzip.scp
--- source/global/setupzip.scp	1 Jun 2002 05:38:49 -0000	1.65.4.2
+++ source/global/setupzip.scp	23 Sep 2002 22:42:01 -0000
@@ -10,7 +10,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libmcnttype.so";
+        Name            = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
         #else
         Name            = "mcnttype.dll";
         #endif
@@ -38,7 +38,7 @@
             Dir             = GCFG_BINARY_DIR;
         #endif
         #ifdef UNX
-            Name            = STRING(CONCAT4(libvcl,SUPD,DLLSUFFIX,.so));
+            Name            = STRING(CONCAT4(libvcl,SUPD,DLLSUFFIX,UNXSUFFIX));
         #else
             Name            = STRING(CONCAT4(vcl,SUPD,DLLSUFFIX,.dll));
         #endif
@@ -55,7 +55,7 @@
     Styles          = (PACKED, SETUPZIP);
     Dir             = GCFG_BINARY_DIR;
   #ifdef UNX
-    Name            = "libasv.so";
+    Name            = STRING(CONCAT2(libasv,UNXSUFFIX));
   #else
     Name            = "asv.dll";
   #endif
@@ -92,7 +92,7 @@
 File GID_FILE_LIB_LOCALEDATA_ASCII
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "liblocaledata_ascii.so";
+    Name            = STRING(CONCAT2(liblocaledata_ascii,UNXSUFFIX));
     #else
     Name            = "localedata_ascii.dll";
 	#endif
@@ -103,7 +103,7 @@
 File GID_FILE_LIB_LOCALEDATA_CJK
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "liblocaledata_CJK.so";
+    Name            = STRING(CONCAT2(liblocaledata_CJK,UNXSUFFIX));
     #else
     Name            = "localedata_CJK.dll";
 	#endif
@@ -136,12 +136,12 @@
         Dir             = GCFG_BINARY_DIR;
 #ifdef UNX
   #if defined(_gcc3) || defined(_GCC)
-            Name            = STRING(CONCAT3(libstlport_,gcc,.so));
+            Name            = STRING(CONCAT3(libstlport_,gcc,UNXSUFFIX));
   #else
     #ifdef SOLARIS
-            Name            = STRING(CONCAT3(libstlport_,sunpro,.so));
+            Name            = STRING(CONCAT3(libstlport_,sunpro,UNXSUFFIX));
     #else
-            Name            = STRING(CONCAT3(libstlport_,COMNAME,.so));
+            Name            = STRING(CONCAT3(libstlport_,COMNAME,UNXSUFFIX));
 	#endif
   #endif
 #else
@@ -156,7 +156,7 @@
 File GID_FILE_LIB_COLLATOR
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libcollator.so";
+    Name            = STRING(CONCAT2(libcollator,UNXSUFFIX));
 	#else
     Name            = "collator.dll";
 	#endif
@@ -173,7 +173,7 @@
 	Dir				= GCFG_BINARY_DIR;
 	Styles			= (PACKED, SETUPZIP);
     #ifdef UNX
-      Name          = STRING(CONCAT3(libucbhelper1,COMID,.so));
+      Name          = STRING(CONCAT3(libucbhelper1,COMID,UNXSUFFIX));
     #else
       Name          = STRING(CONCAT3(ucbhelper1,COMID,.dll));
 	#endif
@@ -283,7 +283,7 @@
 File GID_FILE_LIB_J
 	BIN_FILE_BODY;
 	#ifdef UNX
-	Name			= STRING(CONCAT6(lib,j,SUPD,DLLSUFFIX,_g,.so));
+	Name			= STRING(CONCAT6(lib,j,SUPD,DLLSUFFIX,_g,UNXSUFFIX));
 	#else
 	Name			= STRING(CONCAT5(j,SUPD,DLLSUFFIX,_g,.dll));
 	#endif
@@ -300,7 +300,7 @@
 File GID_FILE_LIB_COMPHELPER2
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libcomphelp2.so";
+    Name            = STRING(CONCAT2(libcomphelp2,UNXSUFFIX));
 	#else
     Name            = "comphelp2.dll";
 	#endif
@@ -316,7 +316,7 @@
 File GID_FILE_LIB_VOS
 	BIN_FILE_BODY;
     #ifdef UNX
-      Name          = STRING(CONCAT3(libvos2,COMID,.so));
+      Name          = STRING(CONCAT3(libvos2,COMID,UNXSUFFIX));
     #else
       Name          = STRING(CONCAT3(vos2,COMID,.dll));
 	#endif
@@ -392,7 +392,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
 #ifdef UNX
-        Name            = STRING(CONCAT4(libdtransX11,SUPD,DLLSUFFIX,.so));
+        Name            = STRING(CONCAT4(libdtransX11,SUPD,DLLSUFFIX,UNXSUFFIX));
 #else
         Name            = "sysdtrans.dll";
 #endif
@@ -417,4 +417,22 @@
 
 #endif
 
+#ifdef MACOSX
+
+File GID_FILE_LIB_STATIC
+        BIN_FILE_BODY;
+        Styles          = (PACKED, SETUPZIP);
+        #ifdef SRV_PRODUCT
+            Dir             = GID_DIR_PROGRAM_LOCAL;
+        #else
+            Dir             = GCFG_BINARY_DIR;
+        #endif
+        #ifdef UNX      
+            Name            = STRING(CONCAT3(libstatic,DLLSUFFIX,UNXSUFFIX));
+        #else
+            Name            = STRING(CONCAT3(vcl,DLLSUFFIX,.dll));
+        #endif
+End     
+
+#endif
 
Index: source/global/udk_base.scp
===================================================================
RCS file: /cvs/installation/scp/source/global/udk_base.scp,v
retrieving revision 1.1
diff -u -r1.1 udk_base.scp
--- source/global/udk_base.scp	27 Jun 2001 14:27:35 -0000	1.1
+++ source/global/udk_base.scp	23 Sep 2002 22:42:01 -0000
@@ -1,4 +1,4 @@
 #include "gid.inc"
 #include "szipmac.inc"
 
-#include <scp/udk_basefiles.scp>
\ No newline at end of file
+#include <scp/udk_basefiles.scp>
Index: source/grafikfilter/files_grafik.scp
===================================================================
RCS file: /cvs/installation/scp/source/grafikfilter/files_grafik.scp,v
retrieving revision 1.4
diff -u -r1.4 files_grafik.scp
--- source/grafikfilter/files_grafik.scp	9 Jul 2001 13:49:30 -0000	1.4
+++ source/grafikfilter/files_grafik.scp	23 Sep 2002 22:42:01 -0000
@@ -93,7 +93,7 @@
 #ifdef WNT
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
Index: source/impress/files_impress.scp
===================================================================
RCS file: /cvs/installation/scp/source/impress/files_impress.scp,v
retrieving revision 1.12
diff -u -r1.12 files_impress.scp
--- source/impress/files_impress.scp	16 Oct 2001 14:26:04 -0000	1.12
+++ source/impress/files_impress.scp	23 Sep 2002 22:42:01 -0000
@@ -93,7 +93,7 @@
 #ifdef WNT
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
Index: source/math/files_math.scp
===================================================================
RCS file: /cvs/installation/scp/source/math/files_math.scp,v
retrieving revision 1.16
diff -u -r1.16 files_math.scp
--- source/math/files_math.scp	16 Oct 2001 14:25:26 -0000	1.16
+++ source/math/files_math.scp	23 Sep 2002 22:42:01 -0000
@@ -93,7 +93,7 @@
 #ifdef WNT
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
Index: source/office/files.scp
===================================================================
RCS file: /cvs/installation/scp/source/office/files.scp,v
retrieving revision 1.314.2.6.2.2
diff -u -r1.314.2.6.2.2 files.scp
--- source/office/files.scp	1 Jun 2002 05:38:52 -0000	1.314.2.6.2.2
+++ source/office/files.scp	23 Sep 2002 22:42:02 -0000
@@ -93,7 +93,7 @@
 #ifdef WNT
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
@@ -402,7 +402,7 @@
 File GID_FILE_LIB_DTRANS
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libdtrans.so";
+    Name            = STRING(CONCAT2(libdtrans,UNXSUFFIX));
 	#else
     Name            = "dtrans.dll";
 	#endif
@@ -429,7 +429,7 @@
 File GID_FILE_LIB_UCPCHELP1
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libucpchelp1.so";
+    Name            = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
 	#else
     Name            = "ucpchelp1.dll";
 	#endif
@@ -453,7 +453,7 @@
 File GID_FILE_LIB_DBT
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libdbtools2.so";
+    Name            = STRING(CONCAT2(libdbtools2,UNXSUFFIX));
 	#else
     Name            = "dbtools2.dll";
 	#endif
@@ -466,17 +466,20 @@
 File GID_FILE_LIB_DBODBCBASE
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libodbcbase2.so";
+    Name            = STRING(CONCAT2(libodbcbase2,UNXSUFFIX));
 	#else
     Name            = "odbcbase2.dll";
 	#endif
     Dir             = GID_DIR_PROGRAM;
 	Styles			= (PACKED);
 End
+
+#ifndef MACOSX
+
 File GID_FILE_LIB_MOZABDRV
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libmozabdrv2.so";
+    Name            = STRING(CONCAT2(libmozabdrv2,UNXSUFFIX));
 	#else
     Name            = "mozabdrv2.dll";
 	#endif
@@ -484,6 +487,7 @@
 	Styles			= (PACKED);
 End
 
+#endif
 
 STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
 STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
@@ -552,7 +556,7 @@
 File GID_FILE_LIB_DICT_JA_JP
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libdict_ja_JP.so";
+    Name            = STRING(CONCAT2(libdict_ja_JP,UNXSUFFIX));
 	#else
     Name            = "dict_ja_JP.dll";
 	#endif
@@ -563,7 +567,7 @@
 File GID_FILE_LIB_DICT_ZH_CN
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libdict_zh_CN.so";
+    Name            = STRING(CONCAT2(libdict_zh_CN,UNXSUFFIX));
     #else
     Name            = "dict_zh_CN.dll";
 	#endif
@@ -574,7 +578,7 @@
 File GID_FILE_LIB_DICT_ZH_TW
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libdict_zh_TW.so";
+    Name            = STRING(CONCAT2(libdict_zh_TW,UNXSUFFIX));
     #else
     Name            = "dict_zh_TW.dll";
 	#endif
@@ -601,7 +605,7 @@
     Styles          = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
     RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
 	#ifdef UNX
-    Name            = "libportal.so";
+    Name            = STRING(CONCAT2(libportal,UNXSUFFIX));
 	#else
     Name            = "portal.dll";
 	#endif
@@ -611,7 +615,7 @@
 File GID_PORTAL_FILE_LIB_PORTALCONNECT
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "libportalconnect.so";
+    Name            = STRING(CONCAT2(libportalconnect,UNXSUFFIX));
 	#else
     Name            = "portalconnect.dll";
 	#endif
@@ -629,7 +633,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libucprmt1.so";
+        Name            = STRING(CONCAT2(libucprmt1,UNXSUFFIX));
         #else
         Name            = "ucprmt1.dll";
         #endif
@@ -840,7 +844,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libadabas2.so";
+        Name            = STRING(CONCAT2(libadabas2,UNXSUFFIX));
         #else
         Name            = "adabas2.dll";
         #endif
@@ -854,7 +858,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libjdbc2.so";
+        Name            = STRING(CONCAT2(libjdbc2,UNXSUFFIX));
         #else
         Name            = "jdbc2.dll";
         #endif
@@ -866,31 +870,35 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libodbc2.so";
+        Name            = STRING(CONCAT2(libodbc2,UNXSUFFIX));
         #else
         Name            = "odbc2.dll";
         #endif
 End
 
+#ifndef MACOSX
+
 File GID_FILE_LIB_MOZAB_2
         BIN_FILE_BODY;
         Styles          = (PACKED,UNO_COMPONENT);
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libmozab2.so";
+        Name            = STRING(CONCAT2(libmozab2,UNXSUFFIX));
         #else
         Name            = "mozab2.dll";
         #endif
 End
 
+#endif
+
 File GID_FILE_LIB_SDBC_2
         BIN_FILE_BODY;
         Styles          = (PACKED,UNO_COMPONENT);
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libsdbc2.so";
+        Name            = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
         #else
         Name            = "sdbc2.dll";
         #endif
@@ -902,7 +910,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libdbpool2.so";
+        Name            = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
         #else
         Name            = "dbpool2.dll";
         #endif
@@ -957,7 +965,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libcached1.so";
+        Name            = STRING(CONCAT2(libcached1,UNXSUFFIX));
         #else
         Name            = "cached1.dll";
         #endif
@@ -969,7 +977,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libucb1.so";
+        Name            = STRING(CONCAT2(libucb1,UNXSUFFIX));
         #else
         Name            = "ucb1.dll";
         #endif
@@ -981,7 +989,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libsax.so";
+        Name            = STRING(CONCAT2(libsax,UNXSUFFIX));
         #else
         Name            = "sax.dll";
         #endif
@@ -993,7 +1001,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libevtatt.so";
+        Name            = STRING(CONCAT2(libevtatt,UNXSUFFIX));
         #else
         Name            = "evtatt.dll";
         #endif
@@ -1005,7 +1013,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libproxyset.so";
+        Name            = STRING(CONCAT2(libproxyset,UNXSUFFIX));
         #else
         Name            = "proxyset.dll";
         #endif
@@ -1037,7 +1045,7 @@
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libdb-3.2.so";
+        Name            = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
         #else
         Name            = "libdb32.dll";
         #endif
@@ -1050,7 +1058,7 @@
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libdb_java-3.2.so";
+        Name            = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
         #else
         Name            = "libdb_java32.dll";
         #endif
@@ -1064,7 +1072,7 @@
         BIN_FILE_BODY;
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
-        Name            = "libdb_cxx-3.2.so";
+        Name            = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
 End
 
 #endif
@@ -1344,7 +1352,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libtvhlp1.so";
+        Name            = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
         #else
         Name            = "tvhlp1.dll";
         #endif
@@ -1516,7 +1524,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libcfgmgr2.so";
+        Name            = STRING(CONCAT2(libcfgmgr2,UNXSUFFIX));
         #else
         Name            = "cfgmgr2.dll";
         #endif
@@ -2993,10 +3001,14 @@
 
 #endif                                  // of #ifdef SOLAR_JAVA
 
+#ifndef MACOSX
+
 File GID_FILE_MOZILLA_RUNTIME
         BIN_FILE_BODY;
         Styles = (ARCHIVE);
         Dir    = GID_DIR_PROGRAM;
         Name	= "mozruntime.zip";
 End
+
+#endif
 
Index: source/player/player.scp
===================================================================
RCS file: /cvs/installation/scp/source/player/player.scp,v
retrieving revision 1.38
diff -u -r1.38 player.scp
--- source/player/player.scp	12 Nov 2001 18:47:25 -0000	1.38
+++ source/player/player.scp	23 Sep 2002 22:42:02 -0000
@@ -421,7 +421,7 @@
 File GID_FILE_LIB_LOCALEDATA_ASCII
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "liblocaledata_ascii.so";
+    Name            = STRING(CONCAT2(liblocaledata_ascii,UNXSUFFIX));
     #else
     Name            = "localedata_ascii.dll";
 	#endif
@@ -432,7 +432,7 @@
 File GID_FILE_LIB_LOCALEDATA_CJK
 	BIN_FILE_BODY;
 	#ifdef UNX
-    Name            = "liblocaledata_CJK.so";
+    Name            = STRING(CONCAT2(liblocaledata_CJK,UNXSUFFIX));
     #else
     Name            = "localedata_CJK.dll";
 	#endif
@@ -448,7 +448,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libcfgmgr2l.so";
+        Name            = STRING(CONCAT2(libcfgmgr2l,UNXSUFFIX));
         #else
         Name            = "cfgmgr2l.dll";
         #endif
@@ -462,7 +462,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libsrtrs1.so";
+        Name            = STRING(CONCAT2(libsrtrs1,UNXSUFFIX));
         #else
         Name            = "srtrs1.dll";
         #endif
@@ -475,7 +475,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libsax.so";
+        Name            = STRING(CONCAT2(libsax,UNXSUFFIX));
         #else
         Name            = "sax.dll";
         #endif
@@ -487,7 +487,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
@@ -499,7 +499,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libucb1.so";
+        Name            = STRING(CONCAT2(libucb1,UNXSUFFIX));
         #else
         Name            = "ucb1.dll";
         #endif
@@ -511,7 +511,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libucpfile1.so";
+        Name            = STRING(CONCAT2(libucpfile1,UNXSUFFIX));
         #else
         Name            = "ucpfile1.dll";
         #endif
@@ -523,7 +523,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libucpdav1.so";
+        Name            = STRING(CONCAT2(libucpdav1,UNXSUFFIX));
         #else
         Name            = "ucpdav1.dll";
         #endif
@@ -535,7 +535,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libucppkg1.so";
+        Name            = STRING(CONCAT2(libucppkg1,UNXSUFFIX));
         #else
         Name            = "ucppkg1.dll";
         #endif
@@ -547,7 +547,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libpackage2.so";
+        Name            = STRING(CONCAT2(libpackage2,UNXSUFFIX));
         #else
         Name            = "package2.dll";
         #endif
@@ -1259,7 +1259,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libdnd.so";
+        Name            = STRING(CONCAT2(libdnd,UNXSUFFIX));
         #else
         Name            = "dnd.dll";
         #endif
@@ -1301,7 +1301,7 @@
 File GID_FILE_LIB_SUNPRO5_UNO
         BIN_FILE_BODY;
         Styles                  = (PACKED);
-        Name            = "libsunpro5_uno.so";
+        Name            = STRING(CONCAT2(libsunpro5_uno,UNXSUFFIX));
 		Dir				= GCFG_BINARY_DIR;
 End
 
@@ -1312,7 +1312,7 @@
 File GID_FILE_LIB_GCC2_UNO
         BIN_FILE_BODY;
         Styles                  = (PACKED);
-        Name            = "libgcc2_uno.so";
+        Name            = STRING(CONCAT2(libgcc2_uno,UNXSUFFIX));
 		Dir				= GCFG_BINARY_DIR;
 End
 
Index: source/psprint/files_psprint.scp
===================================================================
RCS file: /cvs/installation/scp/source/psprint/files_psprint.scp,v
retrieving revision 1.7
diff -u -r1.7 files_psprint.scp
--- source/psprint/files_psprint.scp	7 Dec 2001 10:31:45 -0000	1.7
+++ source/psprint/files_psprint.scp	23 Sep 2002 22:42:02 -0000
@@ -93,7 +93,7 @@
 #ifdef WNT
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \