Index: inc/gcfg.inc
===================================================================
RCS file: /cvs/installation/scp/inc/gcfg.inc,v
retrieving revision 1.64
diff -u -r1.64 gcfg.inc
--- inc/gcfg.inc	10 Jun 2003 13:17:05 -0000	1.64
+++ inc/gcfg.inc	14 Jul 2003 13:06:51 -0000
@@ -168,6 +168,8 @@
 #define CONCAT7( x, y, z, a, b, c, u)       DOCONCAT7(x,y,z,a,b,c,u)
 #define DOCONCAT8( x, y, z, a, b, c, u, v)  x##y##z##a##b##c##u##v
 #define CONCAT8( x, y, z, a, b, c, u, v)    DOCONCAT8(x,y,z,a,b,c,u,v)
+#define DOCONCAT9( x, y, z, a, b, c, u, v, w)  x##y##z##a##b##c##u##v##w
+#define CONCAT9( x, y, z, a, b, c, u, v, w)    DOCONCAT9(x,y,z,a,b,c,u,v,w)
 
 /* --------------------------------------------------*/
 
@@ -199,8 +201,16 @@
 /* --------------------------------------------------*/
 
 #ifdef UNX
-#define LIBNAME(name)                       STRING(CONCAT5(lib,name,OFFICEUPD,DLLSUFFIX,.so))
-#define LIBSHORTNAME(name)                  STRING(CONCAT4(lib,name,DLLSUFFIX,.so))
+#ifdef MACOSX
+#define UNXSUFFIX .dylib
+#else
+#define UNXSUFFIX .so
+#endif
+#endif
+
+#ifdef UNX
+#define LIBNAME(name)                       STRING(CONCAT5(lib,name,OFFICEUPD,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: inc/gid.inc
===================================================================
RCS file: /cvs/installation/scp/inc/gid.inc,v
retrieving revision 1.356.6.3
diff -u -r1.356.6.3 gid.inc
--- inc/gid.inc	4 Jul 2003 11:02:53 -0000	1.356.6.3
+++ inc/gid.inc	14 Jul 2003 13:07:10 -0000
@@ -993,6 +993,7 @@
 #define GID_FILE_LIB_CACHED1                        gid_File_Lib_Cached1
 #define GID_FILE_LIB_UCBHELPER                      gid_File_Lib_Ucbhelper
 #define GID_FILE_LIB_STLPORT                        gid_File_Lib_Stlport
+#define GID_FILE_LIB_SALEXTRA                       gid_File_Lib_Salextra
 #define GID_FILE_LIB_STLPORT_VC6					gid_File_Lib_Stlport_Vc6
 #define GID_RVP_FILE_LIB_STLPORT                    gid_Rvp_File_Lib_Stlport
 #define GID_FILE_LIB_ADO_2                          gid_File_Lib_Ado_2
Index: source/calc/files_calc.scp
===================================================================
RCS file: /cvs/installation/scp/source/calc/files_calc.scp,v
retrieving revision 1.20
diff -u -r1.20 files_calc.scp
--- source/calc/files_calc.scp	17 Apr 2003 10:04:26 -0000	1.20
+++ source/calc/files_calc.scp	14 Jul 2003 13:07:10 -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/cde/files_cde.scp
===================================================================
RCS file: /cvs/installation/scp/source/cde/files_cde.scp,v
retrieving revision 1.3
diff -u -r1.3 files_cde.scp
--- source/cde/files_cde.scp	4 Jun 2003 12:57:11 -0000	1.3
+++ source/cde/files_cde.scp	14 Jul 2003 13:07:10 -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.16
diff -u -r1.16 files_chart.scp
--- source/chart/files_chart.scp	25 Nov 2002 15:39:16 -0000	1.16
+++ source/chart/files_chart.scp	14 Jul 2003 13:07:10 -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.17
diff -u -r1.17 files_draw.scp
--- source/draw/files_draw.scp	25 Nov 2002 15:41:48 -0000	1.17
+++ source/draw/files_draw.scp	14 Jul 2003 13:07:11 -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.43
diff -u -r1.43 files_fonts.scp
--- source/fonts/files_fonts.scp	12 Jun 2003 10:51:46 -0000	1.43
+++ source/fonts/files_fonts.scp	14 Jul 2003 13:07:12 -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.109.6.2
diff -u -r1.109.6.2 setupzip.scp
--- source/global/setupzip.scp	2 Jul 2003 08:57:29 -0000	1.109.6.2
+++ source/global/setupzip.scp	14 Jul 2003 13:07:12 -0000
@@ -34,7 +34,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "libmcnttype.so";
+        Name            = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
         #else
         Name            = "mcnttype.dll";
         #endif
@@ -70,7 +70,7 @@
 File GID_FILE_LIB_LOCALEDATA_EN
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "liblocaledata_en.so";
+    Name            = STRING(CONCAT2(liblocaledata_en,UNXSUFFIX));
     #else
     Name            = "localedata_en.dll";
 	#endif
@@ -81,7 +81,7 @@
 File GID_FILE_LIB_LOCALEDATA_ES
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "liblocaledata_es.so";
+    Name            = STRING(CONCAT2(liblocaledata_es,UNXSUFFIX));
     #else
     Name            = "localedata_es.dll";
 	#endif
@@ -92,7 +92,7 @@
 File GID_FILE_LIB_LOCALEDATA_EURO
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "liblocaledata_euro.so";
+    Name            = STRING(CONCAT2(liblocaledata_euro,UNXSUFFIX));
     #else
     Name            = "localedata_euro.dll";
 	#endif
@@ -103,7 +103,7 @@
 File GID_FILE_LIB_LOCALEDATA_OTHERS
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "liblocaledata_others.so";
+    Name            = STRING(CONCAT2(liblocaledata_others,UNXSUFFIX));
     #else
     Name            = "localedata_others.dll";
 	#endif
@@ -121,7 +121,7 @@
 File GID_FILE_LIB_ICUDATA
 	TXT_FILE_BODY;
 	#ifdef UNX
-        Name        = STRING(CONCAT5(libicudata.so.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
+        Name        = STRING(CONCAT7(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
     #else
         Name        = STRING(CONCAT5(icudt,ICU_MAJOR,ICU_MINOR,l,.dll));
 	#endif
@@ -134,14 +134,14 @@
 Shortcut gid_Shortcut_Lib_Icudata_1
     FileID      = GID_FILE_LIB_ICUDATA;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(CONCAT3(libicudata.so.,ICU_MAJOR,ICU_MINOR));
+    Name        = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
     Styles      = (NETWORK,RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Icudata_0
     FileID      = GID_FILE_LIB_ICUDATA;
     Dir         = GCFG_BINARY_DIR;
-    Name        = "libicudata.so";
+    Name        = STRING(CONCAT2(libicudata,UNXSUFFIX));
     Styles      = (NETWORK,RELATIVE);
 End
 
@@ -150,7 +150,7 @@
 File GID_FILE_LIB_ICUI18N
 	TXT_FILE_BODY;
 	#ifdef UNX
-        Name        = STRING(CONCAT5(libicui18n.so.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
+        Name        = STRING(CONCAT7(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
     #else
         Name        = STRING(CONCAT4(icuin,ICU_MAJOR,ICU_MINOR,.dll));
 	#endif
@@ -163,14 +163,14 @@
 Shortcut gid_Shortcut_Lib_Icui18n_1
     FileID      = GID_FILE_LIB_ICUI18N;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(CONCAT3(libicui18n.so.,ICU_MAJOR,ICU_MINOR));
+    Name        = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
     Styles      = (NETWORK,RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Icui18n_0
     FileID      = GID_FILE_LIB_ICUI18N;
     Dir         = GCFG_BINARY_DIR;
-    Name        = "libicui18n.so";
+    Name        = STRING(CONCAT2(libicui18n,UNXSUFFIX));
     Styles      = (NETWORK,RELATIVE);
 End
 
@@ -179,7 +179,7 @@
 File GID_FILE_LIB_ICULE
 	TXT_FILE_BODY;
 	#ifdef UNX
-        Name        = STRING(CONCAT5(libicule.so.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
+        Name        = STRING(CONCAT7(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
     #else
         Name        = STRING(CONCAT4(icule,ICU_MAJOR,ICU_MINOR,.dll));
 	#endif
@@ -192,14 +192,14 @@
 Shortcut gid_Shortcut_Lib_Icule_1
     FileID      = GID_FILE_LIB_ICULE;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(CONCAT3(libicule.so.,ICU_MAJOR,ICU_MINOR));
+    Name        = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
     Styles      = (NETWORK,RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Icule_0
     FileID      = GID_FILE_LIB_ICULE;
     Dir         = GCFG_BINARY_DIR;
-    Name        = "libicule.so";
+    Name        = STRING(CONCAT2(libicule,UNXSUFFIX));
     Styles      = (NETWORK,RELATIVE);
 End
 
@@ -208,7 +208,7 @@
 File GID_FILE_LIB_ICUUC
 	TXT_FILE_BODY;
 	#ifdef UNX
-        Name        = STRING(CONCAT5(libicuuc.so.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
+        Name        = STRING(CONCAT7(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
     #else
         Name        = STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll));
 	#endif
@@ -220,14 +220,14 @@
 Shortcut gid_Shortcut_Lib_Icuuc_1
     FileID      = GID_FILE_LIB_ICUUC;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(CONCAT3(libicuuc.so.,ICU_MAJOR,ICU_MINOR));
+    Name        = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
     Styles      = (NETWORK,RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Icuuc_0
     FileID      = GID_FILE_LIB_ICUUC;
     Dir         = GCFG_BINARY_DIR;
-    Name        = "libicuuc.so";
+    Name        = STRING(CONCAT2(libicuuc,UNXSUFFIX));
     Styles      = (NETWORK,RELATIVE);
 End
 #endif
@@ -241,6 +241,15 @@
 UNO_SETUPZIP_LIB_FILE( GID_FILE_LIB_SVL, svl )
 UNO_SETUPZIP_LIB_FILE( GID_FILE_LIB_UUI, uui )
 
+#ifdef MACOSX
+File GID_FILE_LIB_SALEXTRA
+    TXT_FILE_BODY;
+    Name    		= "libsalextra_x11osx_mxp.dylib";
+    Dir                 = GCFG_BINARY_DIR;
+    Styles              = (PACKED, SETUPZIP);
+End
+#endif
+
 File GID_FILE_LIB_STLPORT
         TXT_FILE_BODY;
         Styles          = (PACKED, SETUPZIP);
@@ -250,7 +259,7 @@
     #ifdef IRIX
             Name            = STRING(CONCAT3(libstlport_,gcc,.so.4.5));
     #else
-            Name            = STRING(CONCAT3(libstlport_,gcc,.so));
+            Name            = STRING(CONCAT4(libstlport_,gcc,UNXSUFFIX,.4.5));
     #endif
   #else
     #ifdef SOLARIS
@@ -273,7 +282,7 @@
 File GID_FILE_LIB_COLLATOR
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "libcollator.so";
+    Name            = STRING(CONCAT2(libcollator,UNXSUFFIX));
 	#else
     Name            = "collator.dll";
 	#endif
@@ -284,7 +293,7 @@
 File GID_FILE_LIB_HHC_WORD
         TXT_FILE_BODY;
         #ifdef UNX
-    Name            = "libhhc_word.so";
+    Name            = STRING(CONCAT2(libhhc_word,UNXSUFFIX));
         #else
     Name            = "hhc_word.dll";
         #endif
@@ -299,7 +308,7 @@
 	Dir				= GCFG_BINARY_DIR;
 	Styles			= (PACKED, SETUPZIP);
     #ifdef UNX
-      Name          = STRING(CONCAT3(libucbhelper2,COMID,.so));
+      Name          = STRING(CONCAT3(libucbhelper2,COMID,UNXSUFFIX));
     #else
       Name          = STRING(CONCAT3(ucbhelper2,COMID,.dll));
 	#endif
@@ -317,7 +326,7 @@
 File GID_FILE_LIB_I18NUTIL
 	TXT_FILE_BODY;
     #ifdef UNX
-      Name          = STRING(CONCAT3(libi18nutil,COMID,.so));
+      Name          = STRING(CONCAT3(libi18nutil,COMID,UNXSUFFIX));
     #else
       Name          = STRING(CONCAT3(i18nutil,COMID,.dll));
 	#endif
@@ -387,7 +396,7 @@
 File GID_FILE_LIB_J
 	TXT_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
@@ -402,7 +411,7 @@
 File GID_FILE_LIB_COMPHELPER2
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = STRING(CONCAT3(libcomphelp3,COMID,.so));
+    Name            = STRING(CONCAT3(libcomphelp3,COMID,UNXSUFFIX));
 	#else
     Name            = STRING(CONCAT3(comphelp3,COMID,.dll));
 	#endif
@@ -418,7 +427,7 @@
 File GID_FILE_LIB_VOS
 	TXT_FILE_BODY;
     #ifdef UNX
-      Name          = STRING(CONCAT3(libvos3,COMID,.so));
+      Name          = STRING(CONCAT3(libvos3,COMID,UNXSUFFIX));
     #else
       Name          = STRING(CONCAT3(vos3,COMID,.dll));
 	#endif
@@ -488,7 +497,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_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
@@ -547,6 +556,7 @@
 
 #ifdef UNX
 
+#ifndef MACOSX
 File GID_FILE_LIB_FREETYPE
         Dir             = GCFG_BINARY_DIR;
         TXT_FILE_BODY;
@@ -554,9 +564,10 @@
 #ifdef FREEBSD
 	Name		= "libfreetype.so.9";
 #else
-	Name		= "libfreetype.so.6";
+	Name		= STRING(CONCAT3(libfreetype,UNXSUFFIX,.6));
 #endif
 End
+#endif
 
 #ifdef OSL_PRODUCT
 STD_FONTUNX_FILE( GID_FILE_FNT_VERA, Vera.ttf, Vera Sans)
Index: source/global/udk_base.scp
===================================================================
RCS file: /cvs/installation/scp/source/global/udk_base.scp,v
retrieving revision 1.6
diff -u -r1.6 udk_base.scp
--- source/global/udk_base.scp	12 Jun 2003 10:20:55 -0000	1.6
+++ source/global/udk_base.scp	14 Jul 2003 13:07:12 -0000
@@ -6,7 +6,7 @@
 // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are
 // needed for unxlngi4 environment (setup is linked against it).
 
-#if ( ! defined ( FREEBSD ))
+#if ! (defined (FREEBSD) || defined(MACOSX) )
 #if ( defined( _gcc3 ) && ( defined( C300 ) || defined( C322 ) ))
 
 File gid_File_Lib_gcc
@@ -30,15 +30,16 @@
     Name        = STRING(libstdc++.so);
     Styles      = (NETWORK,RELATIVE);
 End
+
 #endif
 #endif
 
 File gid_File_Lib_Sal
     TXT_FILE_BODY;
     #ifdef UNX
-		Name	= STRING(CONCAT6(libsal.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+	Name	= STRING(CONCAT8(libsal,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
-		Name	= STRING(CONCAT3(sal,UDK_MAJOR,.dll));
+	Name	= STRING(CONCAT3(sal,UDK_MAJOR,.dll));
     #endif
     Dir			= GCFG_BINARY_DIR;
     Styles		= (PACKED, SETUPZIP);
@@ -48,49 +49,49 @@
 Shortcut gid_Shortcut_Lib_Sal
     FileID		= gid_File_Lib_Sal;
     Dir			= GCFG_BINARY_DIR;
-    Name		= STRING(CONCAT2(libsal.so.,UDK_MAJOR));
-    Styles		= (NETWORK,RELATIVE);
+    Name		= STRING(CONCAT4(libsal,UNXSUFFIX,.,UDK_MAJOR));
+    Styles		= (NETWORK, RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Sal_2
     ShortcutID  = gid_Shortcut_Lib_Sal;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(libsal.so);
-    Styles      = (NETWORK,RELATIVE);
+    Name        = STRING(CONCAT2(libsal,UNXSUFFIX));
+    Styles      = (NETWORK, RELATIVE);
 End
 #endif
 
-File gid_File_Lib_Sto
+File gid_File_Lib_Store
     TXT_FILE_BODY;
     #ifdef UNX
-		Name	= STRING(CONCAT6(libstore.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+	Name	= STRING(CONCAT8(libstore,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
-		Name	= STRING(CONCAT3(store,UDK_MAJOR,.dll));
+	Name	= STRING(CONCAT3(store,UDK_MAJOR,.dll));
     #endif
     Dir		= GCFG_BINARY_DIR;
     Styles	= (PACKED, SETUPZIP);
 End
 
 #ifdef UNX
-Shortcut gid_Shortcut_Lib_Sto
-    FileID      = gid_File_Lib_Sto;
+Shortcut gid_Shortcut_Lib_Store
+    FileID      = gid_File_Lib_Store;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(CONCAT2(libstore.so.,UDK_MAJOR));
-    Styles      = (NETWORK,RELATIVE);
+    Name        = STRING(CONCAT4(libstore,UNXSUFFIX,.,UDK_MAJOR));
+    Styles      = (NETWORK, RELATIVE);
 End
 
-Shortcut gid_Shortcut_Lib_Sto_2
-    ShortcutID  = gid_Shortcut_Lib_Sto;
+Shortcut gid_Shortcut_Lib_Store_2
+    ShortcutID  = gid_Shortcut_Lib_Store;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(libstore.so);
-    Styles      = (NETWORK,RELATIVE);
+    Name        = STRING(CONCAT2(libstore,UNXSUFFIX));
+    Styles      = (NETWORK, RELATIVE);
 End
 #endif
 
 File gid_File_Lib_Reg
     TXT_FILE_BODY;
     #ifdef UNX
-		Name	= STRING(CONCAT6(libreg.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+		Name	= STRING(CONCAT8(libreg,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
 		Name	= STRING(CONCAT3(reg,UDK_MAJOR,.dll));
     #endif
@@ -102,14 +103,14 @@
 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
 
 Shortcut gid_Shortcut_Lib_Reg_2
     ShortcutID  = gid_Shortcut_Lib_Reg;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(libreg.so);
+    Name        = STRING(CONCAT2(libreg,UNXSUFFIX));
     Styles      = (NETWORK,RELATIVE);
 End
 #endif
@@ -117,7 +118,7 @@
 File gid_File_Lib_Cppu
     TXT_FILE_BODY;
     #ifdef UNX
-		Name	= STRING(CONCAT6(libcppu.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+		Name	= STRING(CONCAT8(libcppu,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
 		Name	= STRING(CONCAT3(cppu,UDK_MAJOR,.dll));
     #endif
@@ -129,14 +130,14 @@
 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
 
 Shortcut gid_Shortcut_Lib_Cppu_2
     ShortcutID  = gid_Shortcut_Lib_Cppu;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(libcppu.so);
+    Name        = STRING(CONCAT2(libcppu,UNXSUFFIX));
     Styles      = (NETWORK,RELATIVE);
 End
 #endif
@@ -147,7 +148,7 @@
     Styles		= (PACKED, SETUPZIP);
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-	    Name	= STRING(CONCAT8(libcppuhelper,COMID,.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+	    Name	= STRING(CONCAT9(libcppuhelper,COMID,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
 		Name	= STRING(CONCAT5(cppuhelper,UDK_MAJOR,COMID,.,dll));
     #endif
@@ -157,21 +158,21 @@
 Shortcut gid_Shortcut_Lib_Cppuhelper
 	FileID		= gid_File_Lib_Cppuhelper;
 	Dir			= GCFG_BINARY_DIR;
-	Name		= STRING(CONCAT4(libcppuhelper,COMID,.so.,UDK_MAJOR));
+	Name		= STRING(CONCAT5(libcppuhelper,COMID,UNXSUFFIX,.,UDK_MAJOR));
 	Styles		= (NETWORK,RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Cppuhelper_2
 	ShortcutID	= gid_Shortcut_Lib_Cppuhelper;
 	Dir		= GCFG_BINARY_DIR;
-	Name		= STRING(CONCAT3(libcppuhelper,COMID,.so));
+	Name		= STRING(CONCAT3(libcppuhelper,COMID,UNXSUFFIX));
 	Styles		= (NETWORK,RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Cppuhelper_3
 	ShortcutID	= gid_Shortcut_Lib_Cppuhelper;
 	Dir		= GCFG_BINARY_DIR;
-	Name		= STRING(CONCAT4(libcppuhelper,UDK_MAJOR,COMID,.so));
+	Name		= STRING(CONCAT4(libcppuhelper,UDK_MAJOR,COMID,UNXSUFFIX));
 	Styles		= (NETWORK,RELATIVE);
 End
 #endif
@@ -181,7 +182,7 @@
     Styles		= (PACKED, SETUPZIP);
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-		Name	= STRING(CONCAT8(libsalhelper,COMID,.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+		Name	= STRING(CONCAT9(libsalhelper,COMID,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
     #else
         Name	= STRING(CONCAT5(salhelper,UDK_MAJOR,COMID,.,dll));
     #endif
@@ -191,21 +192,21 @@
 Shortcut gid_Shortcut_Lib_Salhelper
 	FileID		= gid_File_Lib_Salhelper;
 	Dir			= GCFG_BINARY_DIR;
-	Name		= STRING(CONCAT4(libsalhelper,COMID,.so.,UDK_MAJOR));
+	Name		= STRING(CONCAT5(libsalhelper,COMID,UNXSUFFIX,.,UDK_MAJOR));
 	Styles		= (NETWORK,RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Salhelper_2
 	ShortcutID	= gid_Shortcut_Lib_Salhelper;
 	Dir		= GCFG_BINARY_DIR;
-	Name		= STRING(CONCAT3(libsalhelper,COMID,.so));
+	Name		= STRING(CONCAT3(libsalhelper,COMID,UNXSUFFIX));
 	Styles		= (NETWORK,RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Salhelper_3
 	ShortcutID	= gid_Shortcut_Lib_Salhelper;
 	Dir		= GCFG_BINARY_DIR;
-	Name		= STRING(CONCAT4(libsalhelper,UDK_MAJOR,COMID,.so));
+	Name		= STRING(CONCAT4(libsalhelper,UDK_MAJOR,COMID,UNXSUFFIX));
 	Styles		= (NETWORK,RELATIVE);
 End
 #endif
@@ -216,7 +217,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-		Name	= "shlibloader.uno.so";
+		Name	= STRING(CONCAT2(shlibloader.uno,UNXSUFFIX));
     #else
 		Name	= "shlibloader.uno.dll";
     #endif
@@ -228,7 +229,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-	Name    = "nestedreg.uno.so";
+	Name    = STRING(CONCAT2(nestedreg.uno,UNXSUFFIX));
     #else
         Name    = "nestedreg.uno.dll";
     #endif
@@ -240,7 +241,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-		Name	= "implreg.uno.so";
+		Name	= STRING(CONCAT2(implreg.uno,UNXSUFFIX));
     #else
 		Name	= "implreg.uno.dll";
     #endif
@@ -252,7 +253,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-        Name	= "regtypeprov.uno.so";
+        Name	= STRING(CONCAT2(regtypeprov.uno,UNXSUFFIX));
 	#else
         Name	= "regtypeprov.uno.dll";
     #endif
@@ -264,7 +265,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-		Name	= "simplereg.uno.so";
+		Name	= STRING(CONCAT2(simplereg.uno,UNXSUFFIX));
 	#else
 		Name	= "simplereg.uno.dll";
 	#endif
@@ -276,7 +277,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-		Name	= "servicemgr.uno.so";
+		Name	= STRING(CONCAT2(servicemgr.uno,UNXSUFFIX));
 	#else
 		Name	= "servicemgr.uno.dll";
 	#endif
@@ -288,7 +289,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-		Name	= "typemgr.uno.so";
+		Name	= STRING(CONCAT2(typemgr.uno,UNXSUFFIX));
 	#else
 		Name	= "typemgr.uno.dll";
 	#endif
@@ -300,7 +301,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-	Name		= "security.uno.so";
+	Name		= STRING(CONCAT2(security.uno,UNXSUFFIX));
 	#else
 	Name		= "security.uno.dll";
 	#endif
@@ -323,7 +324,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-	Name		= "streams.uno.so";
+	Name		= STRING(CONCAT2(streams.uno,UNXSUFFIX));
 	#else
 	Name		= "streams.uno.dll";
 	#endif
@@ -335,7 +336,7 @@
 	RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
 	Dir			= GCFG_BINARY_DIR;
 	#ifdef UNX
-		Name	= "typeconverter.uno.so";
+		Name	= STRING(CONCAT2(typeconverter.uno,UNXSUFFIX));
 	#else
 		Name	= "typeconverter.uno.dll";
 	#endif
@@ -345,7 +346,7 @@
     TXT_FILE_BODY;
     Dir = GCFG_BINARY_DIR;
 #ifdef UNX
-    Name = STRING(CONCAT8(libjvmaccess,COMID,.so.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
+    Name = STRING(CONCAT9(libjvmaccess,COMID,UNXSUFFIX,.,UDK_MAJOR,.,UDK_MINOR,.,UDK_MICRO));
 #else
     Name = STRING(CONCAT5(jvmaccess,UDK_MAJOR,COMID,.,dll));
 #endif
@@ -356,14 +357,14 @@
 Shortcut gid_Shortcut_Lib_Jvmaccess
     FileID = gid_File_Lib_Jvmaccess;
     Dir = GCFG_BINARY_DIR;
-    Name = STRING(CONCAT4(libjvmaccess,COMID,.so.,UDK_MAJOR));
+    Name = STRING(CONCAT5(libjvmaccess,COMID,UNXSUFFIX,.,UDK_MAJOR));
     Styles = (NETWORK,RELATIVE);
 End
 
 Shortcut gid_Shortcut_Lib_Jvmaccess_2
     ShortcutID  = gid_Shortcut_Lib_Jvmaccess;
     Dir = GCFG_BINARY_DIR;
-    Name = STRING(CONCAT3(libjvmaccess,COMID,.so));
+    Name = STRING(CONCAT3(libjvmaccess,COMID,UNXSUFFIX));
     Styles = (NETWORK,RELATIVE);
 End
 #endif
Index: source/global/udk_bridges.scp
===================================================================
RCS file: /cvs/installation/scp/source/global/udk_bridges.scp,v
retrieving revision 1.2
diff -u -r1.2 udk_bridges.scp
--- source/global/udk_bridges.scp	27 Mar 2003 10:20:04 -0000	1.2
+++ source/global/udk_bridges.scp	14 Jul 2003 13:07:12 -0000
@@ -16,34 +16,24 @@
 #endif
 
 
-#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(IRIX)
+#if defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(IRIX) || defined(MACOSX)
 
 File gid_File_Lib_Gcc2_Uno
     TXT_FILE_BODY;
     Styles	= (PACKED,SETUPZIP);
-    Name	= STRING(CONCAT3(lib,COMNAME,_uno.so));
+    Name	= STRING(CONCAT4(lib,COMNAME,_uno,UNXSUFFIX));
     Dir		= GCFG_BINARY_DIR;
 End
 
 #endif
 
-#ifdef MACOSX
-
-File gid_File_Lib_Gcc2_Uno
-        TXT_FILE_BODY;
-        Styles      = (PACKED,SETUPZIP);
-        Name        = "libgcc2_uno.dylib";
-	Dir				= GCFG_BINARY_DIR;
-End
-
-#endif
 
 #ifdef SOLARIS
 
 File gid_File_Lib_Sunpro5_Uno
     TXT_FILE_BODY;
     Styles	= (PACKED,SETUPZIP);
-    Name	= STRING(CONCAT3(lib,COMNAME,_uno.so));
+    Name	= STRING(CONCAT4(lib,COMNAME,_uno,UNXSUFFIX));
     Dir		= GCFG_BINARY_DIR;
 End
 
Index: source/global/udk_complete.scp
===================================================================
RCS file: /cvs/installation/scp/source/global/udk_complete.scp,v
retrieving revision 1.3
diff -u -r1.3 udk_complete.scp
--- source/global/udk_complete.scp	23 Apr 2003 17:06:26 -0000	1.3
+++ source/global/udk_complete.scp	14 Jul 2003 13:07:12 -0000
@@ -9,7 +9,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir		= GID_DIR_PROGRAM;
     #ifdef UNX
-	Name	= "corereflection.uno.so";
+	Name	= STRING(CONCAT2(corereflection.uno,UNXSUFFIX));
     #else
 	Name	= "corereflection.uno.dll";
     #endif
@@ -21,7 +21,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir		= GID_DIR_PROGRAM;
     #ifdef UNX
-	Name	= "introspection.uno.so";
+	Name	= STRING(CONCAT2(introspection.uno,UNXSUFFIX));
     #else
 	Name	= "introspection.uno.dll";
     #endif
@@ -33,7 +33,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir		= GID_DIR_PROGRAM;
     #ifdef UNX
-	Name	= "invocation.uno.so";
+	Name	= STRING(CONCAT2(invocation.uno,UNXSUFFIX));
     #else
 	Name	= "invocation.uno.dll";
     #endif
@@ -45,7 +45,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir		= GID_DIR_PROGRAM;
     #ifdef UNX
-	Name	= "invocadapt.uno.so";
+	Name	= STRING(CONCAT2(invocadapt.uno,UNXSUFFIX));
     #else
 	Name	= "invocadapt.uno.dll";
     #endif
@@ -57,7 +57,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir		= GCFG_BINARY_DIR;
     #ifdef UNX
-	Name	= "namingservice.uno.so";
+	Name	= STRING(CONCAT2(namingservice.uno,UNXSUFFIX));
     #else
 	Name	= "namingservice.uno.dll";
     #endif
@@ -69,18 +69,19 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir		= GID_DIR_PROGRAM;
     #ifdef UNX
-	Name	= "proxyfac.uno.so";
+	Name	= STRING(CONCAT2(proxyfac.uno,UNXSUFFIX));
     #else
 	Name	= "proxyfac.uno.dll";
     #endif
 End
 
+#ifndef MACOSX
 File gid_File_Lib_OfficeBean
     TXT_FILE_BODY;
     Styles	= (PACKED);
     Dir	= GID_DIR_PROGRAM;
     #ifdef UNX
-	Name	= "libofficebean.so";
+	Name	= STRING(CONCAT2(libofficebean,UNXSUFFIX));
     #else
 	Name	= "officebean.dll";
     #endif
@@ -92,7 +93,7 @@
      Dir             = GCFG_CLASSES_DIR;
      Styles          = (PACKED); 
 End
-
+#endif
 /*
 File gid_File_Lib_Stm
     TXT_FILE_BODY;
@@ -100,7 +101,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir		= GCFG_BINARY_DIR;
     #ifdef UNX
-	Name	= "streams.uno.so";
+	Name	= STRING(CONCAT2(streams.uno,UNXSUFFIX));
     #else
 	Name	= "streams.uno.dll";
     #endif
Index: source/global/udk_java.scp
===================================================================
RCS file: /cvs/installation/scp/source/global/udk_java.scp,v
retrieving revision 1.3
diff -u -r1.3 udk_java.scp
--- source/global/udk_java.scp	23 Apr 2003 17:06:37 -0000	1.3
+++ source/global/udk_java.scp	14 Jul 2003 13:07:12 -0000
@@ -9,7 +9,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-	Name	= "javaloader.uno.so";
+	Name	= STRING(CONCAT2(javaloader.uno,UNXSUFFIX));
     #else
         Name	= "javaloader.uno.dll";
     #endif
@@ -21,7 +21,7 @@
     RegistryID	= GID_STARREGISTRY_APPLICAT_RDB;
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-	Name	= "javavm.uno.so";
+	Name	= STRING(CONCAT2(javavm.uno,UNXSUFFIX));
     #else
 	Name	= "javavm.uno.dll";
     #endif
@@ -31,7 +31,7 @@
     Styles	= (PACKED,SETUPZIP);
     Dir			= GCFG_BINARY_DIR;
     #ifdef UNX
-	Name	= "libjava_uno.so";
+	Name	= STRING(CONCAT2(libjava_uno,UNXSUFFIX));
     #else
 	Name	= "java_uno.dll";
     #endif
@@ -40,7 +40,7 @@
 File gid_File_Lib_Juh
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "libjuh.so";
+    Name            = STRING(CONCAT2(libjuh,UNXSUFFIX));
 	#else
     Name            = "juh.dll";
 	#endif
@@ -51,7 +51,7 @@
 File gid_File_Lib_Juhx
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "libjuhx.so";
+    Name            = STRING(CONCAT2(libjuhx,UNXSUFFIX));
 	#else
     Name            = "juhx.dll";
 	#endif
@@ -62,7 +62,7 @@
 File gid_File_Lib_Jpipe
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "libjpipe.so";
+    Name            = STRING(CONCAT2(libjpipe,UNXSUFFIX));
 	#else
     Name            = "jpipe.dll";
 	#endif
Index: source/global/udk_remote.scp
===================================================================
RCS file: /cvs/installation/scp/source/global/udk_remote.scp,v
retrieving revision 1.3
diff -u -r1.3 udk_remote.scp
--- source/global/udk_remote.scp	23 Apr 2003 17:06:48 -0000	1.3
+++ source/global/udk_remote.scp	14 Jul 2003 13:07:12 -0000
@@ -8,7 +8,7 @@
         Styles          = (PACKED,SETUPZIP);
         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
@@ -18,14 +18,14 @@
 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
 
 Shortcut gid_Shortcut_Lib_Rmcxt_2
     ShortcutID  = gid_Shortcut_Lib_Rmcxt;
     Dir         = GCFG_BINARY_DIR;
-    Name        = STRING(librmcxt.so);
+    Name        = STRING(CONCAT2(librmcxt,UNXSUFFIX));
     Styles      = (NETWORK,RELATIVE);
 End
 #endif
@@ -35,7 +35,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
@@ -47,7 +47,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "remotebridge.uno.so";
+        Name            = STRING(CONCAT2(remotebridge.uno,UNXSUFFIX));
         #else
         Name            = "remotebridge.uno.dll";
         #endif
@@ -59,7 +59,7 @@
         Styles          = (PACKED,SETUPZIP);
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "liburp_uno.so";
+        Name            = STRING(CONCAT2(liburp_uno,UNXSUFFIX));
         #else
         Name            = "urp_uno.dll";
         #endif
@@ -71,7 +71,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "acceptor.uno.so";
+        Name            = STRING(CONCAT2(acceptor.uno,UNXSUFFIX));
         #else
         Name            = "acceptor.uno.dll";
         #endif
@@ -83,7 +83,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "bridgefac.uno.so";
+        Name            = STRING(CONCAT2(bridgefac.uno,UNXSUFFIX));
         #else
         Name            = "bridgefac.uno.dll";
         #endif
@@ -95,7 +95,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "connector.uno.so";
+        Name            = STRING(CONCAT2(connector.uno,UNXSUFFIX));
         #else
         Name            = "connector.uno.dll";
         #endif
@@ -107,7 +107,7 @@
         RegistryID      = GID_STARREGISTRY_APPLICAT_RDB;
         Dir             = GCFG_BINARY_DIR;
         #ifdef UNX
-        Name            = "uuresolver.uno.so";
+        Name            = STRING(CONCAT2(uuresolver.uno,UNXSUFFIX));
         #else
         Name            = "uuresolver.uno.dll";
         #endif
Index: source/gnome/files_gnome.scp
===================================================================
RCS file: /cvs/installation/scp/source/gnome/files_gnome.scp,v
retrieving revision 1.2
diff -u -r1.2 files_gnome.scp
--- source/gnome/files_gnome.scp	11 Apr 2003 17:20:21 -0000	1.2
+++ source/gnome/files_gnome.scp	14 Jul 2003 13:07:13 -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/grafikfilter/files_grafik.scp
===================================================================
RCS file: /cvs/installation/scp/source/grafikfilter/files_grafik.scp,v
retrieving revision 1.7
diff -u -r1.7 files_grafik.scp
--- source/grafikfilter/files_grafik.scp	25 Nov 2002 15:46:32 -0000	1.7
+++ source/grafikfilter/files_grafik.scp	14 Jul 2003 13:07:13 -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.22
diff -u -r1.22 files_impress.scp
--- source/impress/files_impress.scp	22 May 2003 11:00:07 -0000	1.22
+++ source/impress/files_impress.scp	14 Jul 2003 13:07:13 -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/kde/files_kde.scp
===================================================================
RCS file: /cvs/installation/scp/source/kde/files_kde.scp,v
retrieving revision 1.2
diff -u -r1.2 files_kde.scp
--- source/kde/files_kde.scp	27 Mar 2003 10:20:12 -0000	1.2
+++ source/kde/files_kde.scp	14 Jul 2003 13:07:13 -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.21
diff -u -r1.21 files_math.scp
--- source/math/files_math.scp	25 Nov 2002 16:00:08 -0000	1.21
+++ source/math/files_math.scp	14 Jul 2003 13:07:13 -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.357.6.5
diff -u -r1.357.6.5 files.scp
--- source/office/files.scp	4 Jul 2003 11:02:55 -0000	1.357.6.5
+++ source/office/files.scp	14 Jul 2003 13:07:16 -0000
@@ -94,8 +94,8 @@
 #define SPECIAL_NAME(name) STRING(CONCAT2(name,.dll))
 #define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,.dll))
 #else
-#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,.so))
-#define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,.so))
+#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
+#define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,UNXSUFFIX))
 #endif
 
 #define SPECIAL_PORTAL_UNO_LIB_FILE(id,name) \
@@ -235,6 +235,7 @@
 
 #endif
 
+#ifndef MACOSX
 // crashreporter files
 
 File GID_FILE_BIN_CRASHREPORT
@@ -247,6 +248,7 @@
     	Dir             = GID_DIR_PROGRAM;
     	Styles          = (PACKED);
 End
+#endif
 
 #ifdef WNT
 
@@ -268,13 +270,14 @@
 		Styles	= (PACKED);
 End
 
+#ifndef MACOSX
 File GID_FILE_RES_CRASHDUMP
 	TXT_FILE_BODY;
     Name            = "crash_dump.res";
     Dir             = GID_DIR_RESOURCE;
     Styles          = (PACKED);
 End
-
+#endif
 #endif
 
 // special files for migration for 5.2 to 6.0
@@ -381,7 +384,7 @@
 File GID_FILE_LIB_UCPCHELP1
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "libucpchelp1.so";
+    Name            = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
 	#else
     Name            = "ucpchelp1.dll";
 	#endif
@@ -409,7 +412,7 @@
 File GID_FILE_LIB_DBT
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "libdbtools2.so";
+    Name            = STRING(CONCAT2(libdbtools2,UNXSUFFIX));
 	#else
     Name            = "dbtools2.dll";
 	#endif
@@ -422,24 +425,26 @@
 File GID_FILE_LIB_DBODBCBASE
 	TXT_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
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "libmozabdrv2.so";
+    Name            = STRING(CONCAT2(libmozabdrv2,UNXSUFFIX));
 	#else
     Name            = "mozabdrv2.dll";
 	#endif
     Dir             = GID_DIR_PROGRAM;
 	Styles			= (PACKED);
 End
-
+#endif
 
 STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
 STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
@@ -514,7 +519,7 @@
 File GID_FILE_LIB_DICT_JA
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "libdict_ja.so";
+    Name            = STRING(CONCAT2(libdict_ja,UNXSUFFIX));
 	#else
     Name            = "dict_ja.dll";
 	#endif
@@ -525,7 +530,7 @@
 File GID_FILE_LIB_DICT_ZH
 	TXT_FILE_BODY;
 	#ifdef UNX
-    Name            = "libdict_zh.so";
+    Name            = STRING(CONCAT2(libdict_zh,UNXSUFFIX));
     #else
     Name            = "dict_zh.dll";
 	#endif
@@ -747,7 +752,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libadabas2.so";
+        Name            = STRING(CONCAT2(libadabas2,UNXSUFFIX));
         #else
         Name            = "adabas2.dll";
         #endif
@@ -761,7 +766,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libjdbc2.so";
+        Name            = STRING(CONCAT2(libjdbc2,UNXSUFFIX));
         #else
         Name            = "jdbc2.dll";
         #endif
@@ -773,7 +778,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libodbc2.so";
+        Name            = STRING(CONCAT2(libodbc2,UNXSUFFIX));
         #else
         Name            = "odbc2.dll";
         #endif
@@ -784,23 +789,25 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libmysql2.so";
+        Name            = STRING(CONCAT2(libmysql2,UNXSUFFIX));
         #else
         Name            = "mysql2.dll";
         #endif
 End
 
+#ifndef MACOSX
 File GID_FILE_LIB_MOZAB_2
         TXT_FILE_BODY;
         Styles          = (PACKED,UNO_COMPONENT);
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libmozab2.so";
+        Name            = STRING(CONCAT2(libmozab2,UNXSUFFIX));
         #else
         Name            = "mozab2.dll";
         #endif
 End
+#endif
 
 #ifdef UNX
 
@@ -809,7 +816,7 @@
         Styles          = (PACKED,UNO_COMPONENT);
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
-        Name            = "libevoab1.so";
+        Name            = STRING(CONCAT2(libevoab1,UNXSUFFIX));
 End
 
 #endif
@@ -820,7 +827,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libsdbc2.so";
+        Name            = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
         #else
         Name            = "sdbc2.dll";
         #endif
@@ -832,7 +839,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libdbpool2.so";
+        Name            = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
         #else
         Name            = "dbpool2.dll";
         #endif
@@ -853,7 +860,9 @@
 
 //STD_UNO_LIB_FILE( GID_FILE_LIB_OIC, oic)
 STD_UNO_LIB_FILE( GID_FILE_LIB_RES, res)
+#ifndef MACOSX
 STD_UNO_LIB_FILE( GID_FILE_LIB_SCN, scn)
+#endif
 STD_UNO_LIB_FILE( GID_FILE_LIB_SVX, svx)
 STD_UNO_LIB_FILE( GID_FILE_LIB_LNG, lng)
 
@@ -885,7 +894,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libcached1.so";
+        Name            = STRING(CONCAT2(libcached1,UNXSUFFIX));
         #else
         Name            = "cached1.dll";
         #endif
@@ -897,7 +906,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libucb1.so";
+        Name            = STRING(CONCAT2(libucb1,UNXSUFFIX));
         #else
         Name            = "ucb1.dll";
         #endif
@@ -909,7 +918,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "sax.uno.so";
+        Name            = STRING(CONCAT2(sax.uno,UNXSUFFIX));
         #else
         Name            = "sax.uno.dll";
         #endif
@@ -921,7 +930,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libevtatt.so";
+        Name            = STRING(CONCAT2(libevtatt,UNXSUFFIX));
         #else
         Name            = "evtatt.dll";
         #endif
@@ -933,7 +942,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libproxyset.so";
+        Name            = STRING(CONCAT2(libproxyset,UNXSUFFIX));
         #else
         Name            = "proxyset.dll";
         #endif
@@ -944,7 +953,7 @@
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libcurl.so";
+        Name            = STRING(CONCAT2(libcurl,UNXSUFFIX));
         #else
         Name            = "libcurl.dll";
         #endif
@@ -956,7 +965,7 @@
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = STRING(CONCAT3(libi18nregexp,COMID,.so));
+        Name            = STRING(CONCAT3(libi18nregexp,COMID,UNXSUFFIX));
         #else
         Name            = STRING(CONCAT3(i18nregexp,COMID,.dll));
         #endif
@@ -968,7 +977,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libi18nsearch.so";
+        Name            = STRING(CONCAT2(libi18nsearch,UNXSUFFIX));
         #else
         Name            = "i18nsearch.dll";
         #endif
@@ -1001,7 +1010,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
@@ -1014,7 +1023,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
@@ -1028,7 +1037,7 @@
         TXT_FILE_BODY;
         Styles          = (PACKED);
         Dir             = GID_DIR_PROGRAM;
-        Name            = "libdb_cxx-3.2.so";
+        Name            = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
 End
 
 #endif
@@ -1389,7 +1398,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libtvhlp1.so";
+        Name            = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
         #else
         Name            = "tvhlp1.dll";
         #endif
@@ -1570,7 +1579,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libldapbe1.so";
+        Name            = STRING(CONCAT2(libldapbe1,UNXSUFFIX));
         #else
         Name            = "ldapbe1.dll";
         #endif
@@ -1582,7 +1591,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "liboffline1.so";
+        Name            = STRING(CONCAT2(liboffline1,UNXSUFFIX));
         #else
         Name            = "offline1.dll";
         #endif
@@ -1599,7 +1608,7 @@
         RegistryID      = GID_STARREGISTRY_SERVICES_RDB;
         Dir             = GID_DIR_PROGRAM;
         #ifdef UNX
-        Name            = "libcfgmgr2.so";
+        Name            = STRING(CONCAT2(libcfgmgr2,UNXSUFFIX));
         #else
         Name            = "cfgmgr2.dll";
         #endif
@@ -2682,7 +2691,9 @@
 
 #endif
 
+#ifndef MACOSX
 STD_RES_FILE( GID_FILE_RES_SAN, san )
+#endif
 
 #if defined (CLASSIC_FAT_PRODUCT) || defined (OSL_PRODUCT)
 
@@ -3213,11 +3224,13 @@
 
 #endif
 
-#endif                                  // of #ifdef SOLAR_JAVA
-
+#endif
+                                  // of #ifdef SOLAR_JAVA
+#ifndef MACOSX
 File GID_FILE_MOZILLA_RUNTIME
         TXT_FILE_BODY;
         Styles = (ARCHIVE);
         Dir    = GID_DIR_PROGRAM;
         Name	= "mozruntime.zip";
 End
+#endif
Index: source/psprint/files_psprint.scp
===================================================================
RCS file: /cvs/installation/scp/source/psprint/files_psprint.scp,v
retrieving revision 1.13.66.1
diff -u -r1.13.66.1 files_psprint.scp
--- source/psprint/files_psprint.scp	30 Jun 2003 13:05:45 -0000	1.13.66.1
+++ source/psprint/files_psprint.scp	14 Jul 2003 13:07:16 -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/python/python.scp
===================================================================
RCS file: /cvs/installation/scp/source/python/python.scp,v
retrieving revision 1.2.6.1
diff -u -r1.2.6.1 python.scp
--- source/python/python.scp	24 Jun 2003 18:47:09 -0000	1.2.6.1
+++ source/python/python.scp	14 Jul 2003 13:07:16 -0000
@@ -82,7 +82,7 @@
      TXT_FILE_BODY;
      ModuleID = GID_MODULE_PYUNO;
 #ifdef UNX
-    Name            = "libpyuno.so";
+    Name            = STRING(CONCAT2(libpyuno,UNXSUFFIX));
 #else
     Name            = "pyuno.dll";
 #endif
@@ -96,7 +96,7 @@
      ModuleID = GID_MODULE_PYUNO;
      Dir = GCFG_BINARY_DIR;
      #ifdef UNX
-     Name = "pythonloader.uno.so";
+     Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX));
      #else
      Name = "pythonloader.uno.dll";
      #endif
@@ -213,11 +213,12 @@
 #endif
 
 #ifdef UNX
+#ifndef MACOSX
 File gid_File_Lib_Python_so
      TXT_FILE_BODY;
      ModuleID = GID_MODULE_PYUNO;
      Dir = GCFG_BINARY_DIR;
-     Name = "libpython.so.2.2.2";
+     Name = STRING(CONCAT3(libpython,UNXSUFFIX,.2.2.2));
      Styles = (PACKED);
 End
 
@@ -225,15 +226,32 @@
     ModuleID =GID_MODULE_PYUNO;
     FileID = gid_File_Lib_Python_so;
     Dir = GCFG_BINARY_DIR;
-    Name = "libpython.so.2";
+    Name = STRING(CONCAT3(libpython,UNXSUFFIX,.2));
     Styles = (NETWORK,RELATIVE);
 End
+#else
+File gid_File_Lib_Python_so
+     TXT_FILE_BODY;
+     ModuleID = GID_MODULE_PYUNO;
+     Dir = GCFG_BINARY_DIR;
+     Name = STRING(CONCAT2(libpython2.2,UNXSUFFIX));
+     Styles = (PACKED);
+End
+
+Shortcut gid_Shortcut_Lib_Python_1
+    ModuleID =GID_MODULE_PYUNO;
+    FileID = gid_File_Lib_Python_so;
+    Dir = GCFG_BINARY_DIR;
+    Name = STRING(CONCAT2(libpython2,UNXSUFFIX));
+    Styles = (NETWORK,RELATIVE);
+End
+#endif
 
 Shortcut gid_Shortcut_Lib_Python_2
     ModuleID =GID_MODULE_PYUNO;
     FileID = gid_File_Lib_Python_so;
     Dir = GCFG_BINARY_DIR;
-    Name = "libpython.so";
+    Name = STRING(CONCAT2(libpython,UNXSUFFIX));
     Styles = (NETWORK,RELATIVE);
 End
 
@@ -241,7 +259,7 @@
 File gid_File_Pyuno
     TXT_FILE_BODY;
     ModuleID = GID_MODULE_PYUNO;
-    Name            = "pyuno.so";
+    Name            = STRING(CONCAT2(pyuno,UNXSUFFIX));
     Dir			= GCFG_BINARY_DIR;
     Styles          = (PACKED);
 End