#122356# rename toolkit lib due to conflicts on MacOS, it's a workaround for conflicts with sqlite..., will be probably solved with dropping mozilla libs

2 files changed, 11 insertions, 25 deletions

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 759ecabacced..c5ea844124f3 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1503,7 +1503,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Tk, tk )
+STD_LIB_FILE( gid_File_Lib_Tk, ootk )
 STD_LIB_FILE( gid_File_Lib_Acc, acc )
 
 STD_LIB_FILE( gid_File_Lib_Tools, tl )
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 6ad99b5c94af..48e2e2cea183 100644..100755
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -43,25 +43,15 @@ End
 #ifndef MACOSX
 
 #ifdef WNT
-Directory gid_Dir_Sdkoo_Root
+Directory gid_Dir_OpenOffice_Sdk
     ParentID = PREDEFINED_PROGDIR;
     HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
     Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
 End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Openofficeorg_Sdk
+#else
+Directory gid_Dir_OpenOffice_Sdk
     ParentID = PREDEFINED_PROGDIR;
-    HostName = "${UNIXBASISROOTNAME}";
-End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Basis_Sdk
-    ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
-    HostName = "basis${OOOBASEVERSION}";
-    Styles = (BASISDIRECTORY);
+    HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
 End
 #endif
 
@@ -72,11 +62,7 @@ Directory gid_Dir_Basis_Sdk
     ParentID = PREDEFINED_PROGDIR;
     DosName = "OpenOffice_SDK";
 #else
-  #if defined WNT
-    ParentID = gid_Dir_Sdkoo_Root;
-  #else
-    ParentID = gid_Dir_Ooo_Basis_Sdk;
-  #endif
+    ParentID = gid_Dir_OpenOffice_Sdk;
     DosName = "sdk";
 #endif
 End
@@ -183,7 +169,7 @@ Unixlink gid_Unixlink_Sal_Link_Sdk
     Styles = ();
     Name = SCP2_URE_DL_UNO_NORMAL("sal");
     Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("sal", "3");
+    Target = "../../program/" SCP2_URE_DL_UNO_VER("sal", "3");
 End
 #endif
 
@@ -193,7 +179,7 @@ Unixlink gid_Unixlink_Salhelper_Link_Sdk
     Styles = ();
     Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
     Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+    Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
 End
 #endif
 
@@ -203,7 +189,7 @@ Unixlink gid_Unixlink_Cppu_Link_Sdk
     Styles = ();
     Name = SCP2_URE_DL_UNO_NORMAL("cppu");
     Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("cppu", "3");
+    Target = "../../program/" SCP2_URE_DL_UNO_VER("cppu", "3");
 End
 #endif
 
@@ -214,7 +200,7 @@ Unixlink gid_Unixlink_Cppuhelper_Link_Sdk
     // Styles = (LAYERLINK);
     Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
     Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+    Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
 End
 #endif
 
@@ -224,7 +210,7 @@ Unixlink gid_Unixlink_Purpenvhelper_Link_Sdk
     Styles = ();
     Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
     Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+    Target = "../../program/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
 End
 #endif