Fixes for the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case

Change-Id: Ic3d27298264df9aa4e3e976fbca477106dbe180a

scp2/inc/macros.inc

@@ -83,7 +83,6 @@
     #define GID_DIR_URE_JAVA gid_Dir_Classes
     #define GID_DIR_URE_LIB gid_Dir_Frameworks
     #define GID_DIR_URE_SHARE gid_Brand_Dir_Share_Ure
-    #define GID_DIR_URE_SHARE_MISC gid_Brand_Dir_Share_Ure
 #else
     #define GID_BRAND_DIR_ETC gid_Brand_Dir_Program
     #define GID_DIR_PY gid_Brand_Dir_Program
@@ -92,7 +91,6 @@
     #define GID_DIR_URE_JAVA gid_Dir_Ure_Java
     #define GID_DIR_URE_LIB gid_Dir_Ure_Lib
     #define GID_DIR_URE_SHARE gid_Dir_Ure_Share
-    #define GID_DIR_URE_SHARE_MISC gid_Dir_Ure_Misc
 #endif
 
 #define RESFILENAME(name,lang)                STRING(CONCAT3(name,lang,.res))

scp2/source/ooo/common_brand.scp

@@ -45,6 +45,7 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_Uno_Packages,
             gid_Brand_Dir_Share_Uno_Packages_Cache,
             gid_Brand_Dir_Share_Ure,
+            gid_Brand_Dir_Share_Ure_Share,
             gid_Brand_Dir_Share_Glade,
             gid_Brand_Dir_Share_Labels,
             gid_Brand_Dir_Share_Registry,
@@ -452,6 +453,11 @@ Directory gid_Brand_Dir_Share_Ure
     DosName = "ure";
 End
 
+Directory gid_Brand_Dir_Share_Ure_Share
+    ParentID = gid_Brand_Dir_Share_Ure;
+    DosName = "share";
+End
+
 #endif
 
 Directory gid_Brand_Dir_Share_Registry

scp2/source/ooo/ure.scp

@@ -85,13 +85,17 @@ Directory gid_Dir_Ure_Java
 End
 #endif
 
-Directory gid_Dir_Ure_Misc
-    ParentID = SCP2_URE_SHARE_DIR;
+#endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+
+Directory gid_Dir_Ure_Share_Misc
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Brand_Dir_Share_Ure_Share;
+#else
+    ParentID = gir_Dir_Ure_Share;
+#endif
     DosName = "misc";
 End
 
-#endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-
 // Public Dynamic Libraries:
 
 #ifdef AIX
@@ -220,9 +224,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
     ProfileID = gid_Profile_Dl_Uno_Ini;
     Section = "Bootstrap";
     Key = "UNO_SERVICES";
-#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-    Value = "${ORIGIN}/services.rdb ${URE_MORE_SERVICES}";
-#elif defined WNT
+#if defined WNT
     Value = "${ORIGIN}/../misc/services.rdb ${URE_MORE_SERVICES}";
 #else
     Value = "${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}";
@@ -410,14 +412,14 @@ End
 
 File gid_File_Misc_TypesRdb
     TXT_FILE_BODY;
-    Dir = GID_DIR_URE_SHARE_MISC;
+    Dir = gid_Dir_Ure_Share_Misc;
     Name = "types.rdb";
     Styles = (PACKED);
 End
 
 File gid_File_Misc_ServicesRdb
     TXT_FILE_BODY;
-    Dir = GID_DIR_URE_SHARE_MISC;
+    Dir = gid_Dir_Ure_Share_Misc;
     Name = "services.rdb";
     Styles = (PACKED);
 End
@@ -437,7 +439,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_Dir_Ure_Lib,
             gid_Dir_Ure_Share,
             gid_Dir_Ure_Java,
-            gid_Dir_Ure_Misc);
+            gid_Dir_Ure_Share_Misc);
     Files = (auto_ure_ALL,
             gid_File_ThirdpartylicensereadmeHtml_Ure,
             gid_File_Readme_Ure,