Use subfolder names from <config_folders.h>

Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.

Change-Id: I91c95cd8e482818be67307e889ae6df887763f53

21 files changed, 288 insertions, 203 deletions

diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index d9561421fd45..9449d805c251 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -11,10 +11,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base))
 
-# Not sure about that?
-#$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
-#	ENABLE_REPORTBUILDER \
-#))
+$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
+))
 
 $(eval $(call gb_InstallModule_add_templates,scp2/base,\
     scp2/source/templates/module_langpack_base \
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk
index acb100942246..bb3b137dbed2 100644
--- a/scp2/InstallModule_calc.mk
+++ b/scp2/InstallModule_calc.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
 	ENABLE_LPSOLVE \
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
 	SYSTEM_LPSOLVE \
 ))
 
diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
index 63a29f823d0d..84359c99dc8c 100644
--- a/scp2/InstallModule_draw.mk
+++ b/scp2/InstallModule_draw.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/draw))
 
+$(eval $(call gb_InstallModule_define_if_set,scp2/draw,\
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
+))
+
 $(eval $(call gb_InstallModule_add_templates,scp2/draw,\
     scp2/source/templates/module_langpack_draw \
 ))
diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk
index 48b786da109a..d57dc3f34eca 100644
--- a/scp2/InstallModule_impress.mk
+++ b/scp2/InstallModule_impress.mk
@@ -12,6 +12,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/impress))
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,impress))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
 	ENABLE_OPENGL \
 ))
 
diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk
index e25c25e3f388..5c9d214bbd60 100644
--- a/scp2/InstallModule_math.mk
+++ b/scp2/InstallModule_math.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/math))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,math))
 
+$(eval $(call gb_InstallModule_define_if_set,scp2/math,\
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
+))
+
 $(eval $(call gb_InstallModule_add_templates,scp2/math,\
     scp2/source/templates/module_langpack_math \
 ))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 611e252dc6c9..b21e7a2bb9ff 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_KDE4 \
 	ENABLE_LIBLANGTAG \
 	ENABLE_LPSOLVE \
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
 	ENABLE_NPAPI_FROM_BROWSER \
 	ENABLE_NPAPI_INTO_BROWSER \
 	ENABLE_ONLINE_UPDATE \
diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk
index 621e103ca6a4..6e5534f8db4e 100644
--- a/scp2/InstallModule_ure.mk
+++ b/scp2/InstallModule_ure.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ure))
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ure,ure))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
 	SYSTEM_LIBXML \
 ))
 
diff --git a/scp2/InstallModule_writer.mk b/scp2/InstallModule_writer.mk
index afb0c06f8f75..26b94af649a8 100644
--- a/scp2/InstallModule_writer.mk
+++ b/scp2/InstallModule_writer.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/writer))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/writer,writer))
 
+$(eval $(call gb_InstallModule_define_if_set,scp2/writer,\
+	ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
+	ENABLE_MACOSX_SANDBOX \
+))
+
 $(eval $(call gb_InstallModule_add_templates,scp2/writer,\
     scp2/source/templates/module_langpack_writer \
 ))
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 6a4b19a8d6a5..fabb82ddb4d8 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -75,6 +75,26 @@
     #define SPECIAL_COMPONENT_LIB_NAME(name)  STRING(CONCAT2(name,.dll))
 #endif
 
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    #define GID_BRAND_DIR_ETC gid_Brand_Dir_Share
+    #define GID_DIR_PY gid_Brand_Dir_Share
+    #define GID_DIR_URE gid_Dir_Bundle_Contents
+    #define GID_DIR_URE_BIN gid_Brand_Dir_Program
+    #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
+    #define GID_DIR_URE gid_Dir_Common_Ure
+    #define GID_DIR_URE_BIN gid_Dir_Ure_Bin
+    #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))
 #define READMETXTFILENAME(name,lang,ext)      STRING(CONCAT4(name,lang,.,ext))
 #define READMEFILENAME(name,lang)             STRING(CONCAT2(name,lang))
@@ -84,6 +104,12 @@
 
 #define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
 
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    #define SCP2_OOO_LIB_DIR gid_Dir_Frameworks
+#else
+    #define SCP2_OOO_LIB_DIR SCP2_OOO_BIN_DIR
+#endif
+
 #define BIN_FILE_BODY \
         UnixRights   = 755
 
@@ -117,7 +143,7 @@
 #define PACKED_LIB_FILE_BODY \
         LIB_FILE_BODY; \
         Styles = (PACKED); \
-        Dir    = SCP2_OOO_BIN_DIR
+        Dir    = SCP2_OOO_LIB_DIR
 
 #define LIBO_LIB_FILE(id,name) \
     File id \
@@ -190,6 +216,13 @@
         PACKED_LIB_FILE_BODY; \
     End
 
+#define STD_PY_FILE(id,name) \
+    File id \
+        PACKED_TXT_FILE_BODY; \
+        Dir = GID_DIR_PY; \
+        Name = name; \
+    End
+
 // ---------------------------------------
 #define CONDITIONAL_MODULE_ENTRY(name,modid) \
     Module gid_Module_Root_Reg_##name \
@@ -396,7 +429,7 @@ End
 #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
 #else
-#define SCP2_URE_DL_DIR gid_Dir_Ure_Lib
+#define SCP2_URE_DL_DIR GID_DIR_URE_LIB
 #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
 #define SCP2_URE_DL_BARE(n) n STRING(UNXSUFFIX)
 #define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v
@@ -410,7 +443,7 @@ End
     "libuno_" n STRING(COMID) STRING(UNXSUFFIX) "." v
 #define SCP2_URE_DL_UNO_COMID_NORMAL(n)	\
     "libuno_" n STRING(COMID) STRING(UNXSUFFIX)
-#define SCP2_URE_SHARE_DIR gid_Dir_Ure_Share
+#define SCP2_URE_SHARE_DIR GID_DIR_URE_SHARE
 #endif
 #if defined MACOSX
 #define SCP2_URE_JDL_NORMAL(n) "lib" n ".jnilib"
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a6b8f12dcde9..8ea797982a77 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#include "config_folders.h"
+
 Module gid_Module_Root_Brand
     ParentID = gid_Module_Root;
     InstallOrder = "150";
@@ -42,6 +44,7 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_Extensions,
             gid_Brand_Dir_Share_Uno_Packages,
             gid_Brand_Dir_Share_Uno_Packages_Cache,
+            gid_Brand_Dir_Share_Ure,
             gid_Brand_Dir_Share_Glade,
             gid_Brand_Dir_Share_Labels,
             gid_Brand_Dir_Share_Registry,
@@ -87,9 +90,11 @@ Module gid_Module_Root_Brand
 	     git_License_Odt,
 	     gid_Credits_Odt,
 	     gid_Apache_Notice);
+#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Unixlinks = (gid_Brand_Unixlink_Program,
                  gid_Brand_Unixlink_Unopkg,
                  gid_Brand_Unixlink_Urelibs);
+#endif
 End
 
 // Language specific brand module
@@ -121,7 +126,11 @@ Directory gid_Brand_Dir_Program
 End
 
 Directory gid_Brand_Dir_Program_Shell
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Brand_Dir_Share;
+#else
     ParentID = gid_Brand_Dir_Program;
+#endif
     DosName = "shell";
 End
 
@@ -140,7 +149,7 @@ Directory gid_Brand_Dir_Share
 #else
     ParentID = gid_Dir_Brand_Root;
 #endif
-    DosName = "share";
+    DosName = LIBO_SHARE_FOLDER;
 End
 
 Directory gid_Brand_Dir_Share_Config
@@ -431,6 +440,15 @@ Directory gid_Brand_Dir_Share_Labels
     DosName = "labels";
 End
 
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+
+Directory gid_Brand_Dir_Share_Ure
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "ure";
+End
+
+#endif
+
 Directory gid_Brand_Dir_Share_Registry
     ParentID = gid_Brand_Dir_Share;
     DosName = "registry";
@@ -445,7 +463,7 @@ End
 
 // UnixLinks
 
-#if defined MACOSX
+#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 Unixlink gid_Brand_Unixlink_Urelibs
     Dir = gid_Brand_Dir_Program;
     Name = "urelibs";
@@ -453,7 +471,7 @@ Unixlink gid_Brand_Unixlink_Urelibs
 End
 #endif
 
-#if defined MACOSX
+#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 Unixlink gid_Brand_Unixlink_Program
     BIN_FILE_BODY;
     Dir = gid_Dir_Bundle_Contents;
@@ -476,7 +494,7 @@ File gid_Brand_File_Html_Thirdpartylicensereadme
     TXT_FILE_BODY;
 End
 
-#if defined UNX
+#if defined UNX && !defined ENABLE_MACOSX_SANDBOX
 
 File gid_Brand_File_Gdb_Trace
     TXT_FILE_BODY;
@@ -573,7 +591,7 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
-#if defined MACOSX
+#if defined MACOSX && !defined ENABLE_MACOSX_SANDBOX
 Unixlink gid_Brand_Unixlink_Unopkg
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -745,35 +763,35 @@ End
 Profile gid_Brand_Profile_Bootstrap_Ini
     ModuleID = gid_Module_Root_Brand;
     Name = PROFILENAME(bootstrap);
-    Dir = gid_Brand_Dir_Program;
+    Dir = GID_BRAND_DIR_ETC;
     Styles = (NETWORK);
 End
 
 Profile gid_Brand_Profile_Soffice_Ini
     ModuleID = gid_Module_Root_Brand;
     Name = PROFILENAME(soffice);
-    Dir = gid_Brand_Dir_Program;
+    Dir = GID_BRAND_DIR_ETC;
     Styles = (NETWORK);
 End
 
 Profile gid_Brand_Profile_Setup_Ini
     ModuleID = gid_Module_Root_Brand;
     Name = PROFILENAME(setup);
-    Dir = gid_Brand_Dir_Program;
+    Dir = GID_BRAND_DIR_ETC;
     Styles = (NETWORK);
 End
 
 Profile gid_Brand_Profile_Version_Ini
     ModuleID = gid_Module_Root_Brand;
     Name = PROFILENAME(version);
-    Dir = gid_Brand_Dir_Program;
+    Dir = GID_BRAND_DIR_ETC;
     Styles = (NETWORK);
 End
 
 Profile gid_Brand_Profile_Fundamental_Ini
     ModuleID = gid_Module_Root_Brand;
     Name = PROFILENAME(fundamental);
-    Dir = gid_Brand_Dir_Program;
+    Dir = GID_BRAND_DIR_ETC;
 End
 
 #if !defined MACOSX
@@ -1084,12 +1102,28 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
     Value = "${ORIGIN}/..";
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Share_Subdir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BRAND_SHARE_SUBDIR";
+    Value = LIBO_SHARE_FOLDER;
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Bin_Subdir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BRAND_BIN_SUBDIR";
+    Value = LIBO_BIN_FOLDER;
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Lib_Dir
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
     Section = "Bootstrap";
     Key = "LO_LIB_DIR";
-    Value = "${BRAND_BASE_DIR}/program";
+    Value = "${BRAND_BASE_DIR}/" LIBO_LIB_FOLDER;
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Java_Dir
@@ -1097,7 +1131,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Java_Dir
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
     Section = "Bootstrap";
     Key = "LO_JAVA_DIR";
-    Value = "${BRAND_BASE_DIR}/program/classes";
+    Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER;
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
@@ -1185,7 +1219,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
     Section = "Bootstrap";
     Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
-    Value = "${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
+    Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/config/javasettings_${_OS}_${_ARCH}.xml";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_User_Data
@@ -1193,7 +1227,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_User_Data
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
     Section = "Bootstrap";
     Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
-    Value = "${${BRAND_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
+    Value = "${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
@@ -1236,7 +1270,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers
     ModuleID = gid_Module_Root_Brand;
     Section = "Bootstrap";
     Key = "CONFIGURATION_LAYERS";
-    Value = "xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu";
+    Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu";
 End
 
 #if !defined MACOSX
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 26475611a666..3a099a25293e 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -69,7 +69,11 @@ End
 
 Directory gid_Dir_Wizards
     Styles = (CREATE);
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Brand_Dir_Share;
+#else
     ParentID = gid_Brand_Dir_Program;
+#endif
     DosName = "wizards";
 End
 
@@ -80,13 +84,22 @@ Directory gid_Dir_Wizards_Ui
 End
 
 Directory gid_Dir_Resource
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Brand_Dir_Share;
+#else
     ParentID = gid_Brand_Dir_Program;
+#endif
     DosName = "resource";
 End
 
 Directory gid_Dir_Classes
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "java";
+#else
     ParentID = gid_Brand_Dir_Program;
     DosName = "classes";
+#endif
 End
 
 #ifdef WNT
@@ -592,11 +605,19 @@ Directory gid_Dir_Template_Common_Presnt
 End
 
 Directory gid_Brand_Dir_Program_Services
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Brand_Dir_Share;
+#else
     ParentID = gid_Brand_Dir_Program;
+#endif
     DosName = "services";
 End
 
 Directory gid_Brand_Dir_Program_Types
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Brand_Dir_Share;
+#else
     ParentID = gid_Brand_Dir_Program;
+#endif
     DosName = "types";
 End
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index fdc51f102b91..6cd14ab17cf2 100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -30,4 +30,9 @@ Directory gid_Dir_Bundle_Contents
     HostName = "Contents";
     Styles = (OFFICEDIRECTORY);
 End
+
+Directory gid_Dir_Frameworks
+    ParentID = gid_Dir_Bundle_Contents;
+    DosName = "Frameworks";
+End
 #endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b0be7e147ebe..c53de33e7bf8 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -28,18 +28,14 @@
 
 #if defined SOLAR_JAVA && defined WNT
 File gid_File_Lib_Accessbridge
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = "java_uno_accessbridge.dll";
 End
 #endif
 
 #ifndef SYSTEM_CLUCENE
 File gid_File_Lib_CLucene
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libclucene,UNXSUFFIX));
   #else
@@ -124,9 +120,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Dnd
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = "dnd.dll";
 End
 
@@ -135,10 +129,8 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Dtrans
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
     Name = "dtrans.dll";
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
 End
 
 #endif
@@ -151,9 +143,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
 #if defined(WNT) && !defined(DISABLE_ATL)
 
 File gid_File_Lib_Inprocserv
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = "inprocserv.dll";
 End
 
@@ -163,16 +153,12 @@ End
 
 #ifdef MACOSX
 File gid_File_Lib_Macab_1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = STRING(CONCAT2(libmacab1,UNXSUFFIX));
 End
 
 File gid_File_Lib_Macab_Drv_1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX));
 End
 #endif  // #ifdef MACOSX
@@ -182,9 +168,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Fps
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = "fps.dll";
 End
 
@@ -213,10 +197,8 @@ End
 #ifdef MACOSX
 #ifndef X86_64
 File gid_File_Lib_avmediaQuickTime
-	LIB_FILE_BODY;
-	Styles = (PACKED);
+	PACKED_LIB_FILE_BODY;
 	Name = LIBNAME(avmediaQuickTime);
-	Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 #endif
@@ -224,9 +206,7 @@ End
 #ifndef SYSTEM_LCMS2
 
 File gid_File_Lib_Lcms2
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT3(liblcms2,.2,UNXSUFFIX));
@@ -247,9 +227,7 @@ End
 #ifdef NEED_CAIRO
 
 File gid_File_Lib_Cairo
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
@@ -268,9 +246,7 @@ End
 #ifndef WNT
 
 File gid_File_Lib_Pixman
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT2(libpixman-1,UNXSUFFIX));
@@ -287,9 +263,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Ftransl
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = "ftransl.dll";
 End
 
@@ -298,7 +272,7 @@ End
 #ifndef SYSTEM_ICU
 
 File gid_File_Lib_Icudata
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT6(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR));
   #else
@@ -308,12 +282,10 @@ File gid_File_Lib_Icudata
     Name = STRING(CONCAT3(icudt,ICU_MAJOR,.dll));
   #endif // MSVC_PKG_DEBUG_RUNTIME
   #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
 End
 
 File gid_File_Lib_Icui18n
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT6(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR));
   #else
@@ -323,12 +295,10 @@ File gid_File_Lib_Icui18n
     Name = STRING(CONCAT3(icuin,ICU_MAJOR,.dll));
   #endif // MSVC_PKG_DEBUG_RUNTIME
   #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
 End
 
 File gid_File_Lib_Icuuc
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT6(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR));
   #else
@@ -338,8 +308,6 @@ File gid_File_Lib_Icuuc
     Name = STRING(CONCAT3(icuuc,ICU_MAJOR,.dll));
   #endif // MSVC_PKG_DEBUG_RUNTIME
   #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
 End
 
 #endif
@@ -349,7 +317,7 @@ End
 File gid_File_Lib_sn_tools
     LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
-    Dir = SCP2_OOO_BIN_DIR;
+    Dir = SCP2_OOO_LIB_DIR;
     Name = "sn_tools.dll";
 End
 
@@ -365,9 +333,7 @@ STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 #else
 
 File gid_File_Lib_Mozbootstrap
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = "mozbootstrap.dll";
 End
 
@@ -386,7 +352,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 File gid_File_Lib_Officebean
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    Dir = SCP2_OOO_LIB_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libofficebean,UNXSUFFIX));
   #else
@@ -405,25 +371,19 @@ STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #ifdef ENABLE_TDE
 File gid_File_Lib_Vclplug_Tde
     Name = LIBNAME(vclplug_tde);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
 End
 #endif
 #ifdef ENABLE_KDE
 File gid_File_Lib_Vclplug_Kde
     Name = LIBNAME(vclplug_kde);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
 End
 #endif
 #ifdef ENABLE_KDE4
 File gid_File_Lib_Vclplug_Kde4
     Name = LIBNAME(vclplug_kde4);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
 End
 #endif
 #endif
@@ -431,9 +391,7 @@ End
 #if defined(MACOSX)
 File gid_File_Lib_Basebmp
     Name = LIBNAME(basebmp);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
 End
 #endif
 
@@ -447,9 +405,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #if defined UNX && ! defined MACOSX
 
 File gid_File_Lib_Recentfile
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
 End
 
@@ -471,7 +427,6 @@ File gid_File_Lib_Qslnkmsi
     Name = "qslnkmsi.dll";
 End
 
-
 File gid_File_Lib_Sdqsmsi
     LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
@@ -498,18 +453,14 @@ End
 
 File gid_File_Lib_Spa
     Name = LIBNAME(spa);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
 End
 
 #endif
 
 File gid_File_Lib_Spell
-    LIB_FILE_BODY;
-    Styles = (PACKED);
+    PACKED_LIB_FILE_BODY;
     Name = LIBNAME(spell);
-    Dir = SCP2_OOO_BIN_DIR;
 End
 
 #if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS
@@ -518,9 +469,7 @@ STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
     Name = "sysdtrans.dll";
 End
 #endif
@@ -559,23 +508,19 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3)
 #endif //SYSTEM_NSS
 
 File gid_File_Lib_XSec_XmlSec
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
     #ifdef UNX
         Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
     #else
         Name = "xsec_xmlsec.dll";
     #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
 End
 
 #endif
 
 #ifndef SYSTEM_LIBXSLT
 File gid_File_Lib_Xslt
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
@@ -591,9 +536,7 @@ File gid_File_Lib_Xslt
   #endif
 End
 File gid_File_Lib_eXslt
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX));
@@ -612,46 +555,38 @@ End
 
 #ifdef WNT
 File gid_File_Lib_LibXMLSec_xmlseccore
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
     #ifdef _gcc3
       Name = "libxmlsec1.dll";
     #else
       Name = "libxmlsec.dll";
     #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
 End
 
 #ifdef CROSS_COMPILING
 File gid_File_Lib_LibXMLSec_xmlsecnss
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
   #ifdef _gcc3
     Name = "libxmlsec1-nss.dll";
   #else
     Name = "libxmlsec-nss.dll";
   #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
 End
 #else
 File gid_File_Lib_LibXMLSec_xmlsecmscrypto
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
   #ifdef _gcc3
     Name = "libxmlsec1-mscrypto.dll";
   #else
     Name = "libxmlsec-mscrypto.dll";
   #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
 End
 #endif
 #endif
 
 #ifndef SYSTEM_OPENSSL
 File gid_File_Lib_Openssl
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef WNT
     Name = "ssleay32.dll";
   #endif
@@ -660,9 +595,7 @@ End
 
 #ifndef SYSTEM_OPENSSL
 File gid_File_Lib_Crypto
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
 
 	#ifdef WNT
 	  Name = "libeay32.dll";
@@ -695,9 +628,7 @@ End
 
 #ifndef SYSTEM_REDLAND
 File gid_File_Lib_Raptor
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT4(libraptor2-lo,.,RAPTOR_MAJOR,UNXSUFFIX));
@@ -714,9 +645,7 @@ File gid_File_Lib_Raptor
 End
 
 File gid_File_Lib_Rasqal
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT4(librasqal-lo,.,RASQAL_MAJOR,UNXSUFFIX));
@@ -733,9 +662,7 @@ File gid_File_Lib_Rasqal
 End
 
 File gid_File_Lib_Rdf
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT4(librdf-lo,.,REDLAND_MAJOR,UNXSUFFIX));
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index f51f0a6e45c2..8972d34f4f3f 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -139,7 +139,7 @@ File gid_File_Bin_UIPreviewer
   #endif
 End
 
-#ifdef UNX
+#if defined UNX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
 File gid_File_Script_Gengal
     BIN_FILE_BODY;
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index 791952d95bdc..a5bb3e896d7e 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -20,11 +20,7 @@
 
 Profile gid_Profile_Uno_Ini
     ModuleID = gid_Module_Root;
-  #ifdef UNX
-    Name = "unorc";
-  #else
-    Name = "uno.ini";
-  #endif
-    Dir = gid_Brand_Dir_Program;
+    Name = PROFILENAME(uno);
+    Dir = GID_BRAND_DIR_ETC;
     Styles = (NETWORK);
 End
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 03943690a5d5..5709a7378c67 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#include "config_folders.h"
+
 ProfileItem gid_Profileitem_Setup_Uno_Services
     ProfileID = gid_Profile_Setup_Ini;
     ModuleID = gid_Module_Root;
@@ -100,7 +102,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
     Section = "Bootstrap";
     Order = 1;
     Key = "BUNDLED_EXTENSIONS";
-    Value = "$BRAND_BASE_DIR/share/extensions";
+    Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/extensions";
 End
 
 ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
@@ -109,7 +111,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
     Section = "Bootstrap";
     Order = 1;
     Key = "BUNDLED_EXTENSIONS_USER";
-    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
 End
 
 ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
@@ -118,7 +120,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
     Section = "Bootstrap";
     Order = 1;
     Key = "UNO_SHARED_PACKAGES";
-    Value = "$BRAND_BASE_DIR/share/uno_packages";
+    Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/uno_packages";
 End
 
 ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache
@@ -136,7 +138,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User
     Section = "Bootstrap";
     Order = 1;
     Key = "SHARED_EXTENSIONS_USER";
-    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
 End
 
 ProfileItem gid_Profileitem_Uno_Uno_User_Packages
@@ -145,7 +147,7 @@ ProfileItem gid_Profileitem_Uno_Uno_User_Packages
     Section = "Bootstrap";
     Order = 3;
     Key = "UNO_USER_PACKAGES";
-    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
 End
 
 ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
@@ -154,7 +156,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
     Section = "Bootstrap";
     Order = 1;
     Key = "TMP_EXTENSIONS";
-    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
 End
 
 ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions
@@ -163,7 +165,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions
     Section = "Bootstrap";
     Order = 1;
     Key = "BAK_EXTENSIONS";
-    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak";
 End
 
 ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 963bf9c41e93..99e65909239f 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -19,11 +19,12 @@
 #include "macros.inc"
 
 #ifdef UNX
+#ifndef ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 #ifndef SYSTEM_ICU
 
 Shortcut gid_Shortcut_Lib_Icudata
     FileID = gid_File_Lib_Icudata;
-    Dir = SCP2_OOO_BIN_DIR;
+    Dir = SCP2_OOO_LIB_DIR;
 #ifndef AIX
     Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR));
 #else
@@ -34,7 +35,7 @@ End
 
 Shortcut gid_Shortcut_Lib_Icui18n
     FileID = gid_File_Lib_Icui18n;
-    Dir = SCP2_OOO_BIN_DIR;
+    Dir = SCP2_OOO_LIB_DIR;
 #ifndef AIX
     Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR));
 #else
@@ -45,7 +46,7 @@ End
 
 Shortcut gid_Shortcut_Lib_Icuuc
     FileID = gid_File_Lib_Icuuc;
-    Dir = SCP2_OOO_BIN_DIR;
+    Dir = SCP2_OOO_LIB_DIR;
 #ifndef AIX
     Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR));
 #else
@@ -58,6 +59,8 @@ End
 
 #endif
 
+#endif
+
 #ifdef MACOSX
 
 #ifdef SOLAR_JAVA
@@ -65,7 +68,7 @@ End
 // auto_ooo_lib_hsqldb defined in gbuild ($(WORKDIR)/AutoInstall/ooo)
 Shortcut gid_Shortcut_Lib_Hsqldb_2
     FileID = auto_ooo_lib_hsqldb;
-    Dir = SCP2_OOO_BIN_DIR;
+    Dir = SCP2_OOO_LIB_DIR;
     Name = "libhsqldb.jnilib";
     Styles = (NETWORK, RELATIVE);
 End
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 0ce9a7316bfb..939bd3caf395 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+
 #include "AutoInstall/ure"
 
 Directory gid_Dir_Ure_Bin
@@ -63,9 +65,11 @@ Directory gid_Dir_Ure_Misc
     DosName = "misc";
 End
 
+#endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+
 // Public Executables:
 
-#ifndef WNT
+#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 Shortcut gid_Shortcut_Exe_Uno
     FileID = gid_File_Exe_StartupSh;
     Dir = gid_Dir_Ure_Bin;
@@ -76,7 +80,7 @@ End
 
 // Private Executables:
 
-#if !defined WNT
+#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 File gid_File_Exe_StartupSh
     BIN_FILE_BODY;
     Dir = gid_Dir_Ure_Bin;
@@ -180,12 +184,77 @@ End
 
 // Private Dynamic Libraries:
 
-File gid_File_Dl_Profile_Uno
-    LIB_FILE_BODY;
+// We set up the URE unorc/uno.ini in scp2 because then it is easy to
+// get the platform differences into it compared to constructing it in
+// Makefiles etc. With ENABLE_MACOSX_MACLIKE_APP_STRUCTURE it goes into
+// .app/Contents/Resources/ure/unorc, on Unix into .../ure/lib/unorc
+// and on Windows into .../ure/bin/unorc. The latter two locations
+// are factored out as SCP2_URE_DL_DIR.
+
+Profile gid_Profile_Dl_Uno_Ini
+    ModuleID = gid_Module_Root_Ure_Hidden;
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Brand_Dir_Share_Ure;
+#else
     Dir = SCP2_URE_DL_DIR;
-    Name = PROFILENAME(/ure/uno);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F";
+#endif
+    Name = PROFILENAME(uno);
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    ProfileID = gid_Profile_Dl_Uno_Ini;
+    Section = "Bootstrap";
+    Key = "URE_INTERNAL_LIB_DIR";
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Value = "${ORIGIN}/../../Frameworks";
+#else
+    Value = "${ORIGIN}";
+#endif
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    ProfileID = gid_Profile_Dl_Uno_Ini;
+    Section = "Bootstrap";
+    Key = "URE_INTERNAL_JAVA_DIR";
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Value = "${ORIGIN}/../java";
+#else
+    Value = "${ORIGIN}/../share/java";
+#endif
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Classpath
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    ProfileID = gid_Profile_Dl_Uno_Ini;
+    Section = "Bootstrap";
+    Key = "URE_INTERNAL_JAVA_CLASSPATH";
+    Value = "${URE_MORE_JAVA_TYPES}";
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    ProfileID = gid_Profile_Dl_Uno_Ini;
+    Section = "Bootstrap";
+    Key = "UNO_TYPES";
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}";
+#else
+    Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}";
+#endif
+End
+
+ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
+    ModuleID = gid_Module_Root_Ure_Hidden;
+    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}";
+#else
+    Value = "${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}";
+#endif
 End
 
 #ifdef AIX
@@ -495,7 +564,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_UnoloaderJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "unoloader.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "90F99ED3-814C-4B45-894B-D9248848CEB4";
@@ -505,7 +574,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_JuhJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "juh.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "E77CC8B5-0345-4B7F-ABED-5EB9DC94E492";
@@ -515,7 +584,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_JurtJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "jurt.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "EA63EDCC-9152-4560-AB7A-BFC367442E50";
@@ -525,7 +594,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_RidlJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "ridl.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "4A915C83-6BE3-41B9-BAF9-13AA27034955";
@@ -537,7 +606,7 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Java_JavaUnoJar
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
+    Dir = GID_DIR_URE_JAVA;
     Name = "java_uno.jar";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "ABDC8DDA-5D2B-424C-ABD8-FD22D59658FE";
@@ -548,7 +617,7 @@ End
 
 File gid_File_Misc_TypesRdb
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Misc;
+    Dir = GID_DIR_URE_SHARE_MISC;
     Name = "udkapi.rdb";
     InstallName = "types.rdb";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME);
@@ -557,7 +626,7 @@ End
 
 File gid_File_Misc_ServicesRdb
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Misc;
+    Dir = GID_DIR_URE_SHARE_MISC;
     Name = "/ure/services.rdb";
     Styles = (PACKED);
 End
@@ -567,21 +636,13 @@ End
 #if defined SOLAR_JAVA
 File gid_File_Misc_JavavendorsXml
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Misc;
+    Dir = GID_DIR_URE_SHARE_MISC;
     Name = "javavendors.xml";
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "403FCCFE-545B-44F6-91D1-5C75F846E587";
 End
 #endif
 
-#if defined MACOSX
-Unixlink gid_Unixlink_Ure_Bin_Urelibs
-    Dir = gid_Dir_Ure_Bin;
-    Name = "urelibs";
-    Target = "../lib";
-End
-#endif
-
 //Module
 
 Module gid_Module_Root_Ure_Hidden
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index bc6f3cfe2d6f..70c48d9599d9 100644
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
@@ -42,10 +42,12 @@ File gid_File_UreLink
     Styles = (PACKED);
 End
 #elif defined MACOSX
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 Directory gid_Dir_UreLink
     ParentID = gid_Dir_Bundle_Contents;
     DosName = "ure-link";
 End
+#endif
 #else
 Unixlink gid_Unixlink_UreLink
     BIN_FILE_BODY;
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index dbf59e670efd..e53763f89795 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -28,7 +28,7 @@ File gid_File_scriptproviderforpython
 End
 
 File gid_File_Lib_Pyuno
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
   #else
@@ -38,8 +38,6 @@ File gid_File_Lib_Pyuno
     Name = "pyuno.pyd";
   #endif // MSVC_PKG_DEBUG_RUNTIME
   #endif
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
 End
 
 STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader )
@@ -51,26 +49,9 @@ File gid_File_Pyuno_Rdb
     Styles = (PACKED);
 End
 
-File gid_File_Py_Unohelper
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "pyuno/unohelper.py";
-    Styles = (PACKED);
-End
-
-File gid_File_Py_Uno
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "pyuno/uno.py";
-    Styles = (PACKED);
-End
-
-File gid_File_Py_Pythonloader
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "pyuno/pythonloader.py";
-    Styles = (PACKED);
-End
+STD_PY_FILE(gid_File_Py_Unohelper, "pyuno/unohelper.py")
+STD_PY_FILE(gid_File_Py_Uno, "pyuno/uno.py")
+STD_PY_FILE(gid_File_Py_Pythonloader, "pyuno/pythonloader.py")
 
 #ifndef SYSTEM_PYTHON
 File gid_File_Py_Bin_Python
@@ -130,10 +111,8 @@ End
 
 // pyuno.so even on Mac OS X, because it is a python module
 File gid_File_Pyuno
-    LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
     Name = "pyuno.so";
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
 End
 
 #endif
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index 0bc2a86651d1..ee4dac62b9fa 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -27,7 +27,7 @@ Profile gid_Profile_Pythonloader_Uno_Ini
   #else
     Name = "pythonloader.uno.ini";
   #endif
-    Dir = gid_Brand_Dir_Program;
+    Dir = GID_BRAND_DIR_ETC;
     Styles = (NETWORK);
 End
 
@@ -39,7 +39,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome
     Order = 1;
     Key = "PYUNO_LOADER_PYTHONHOME";
   #ifdef MACOSX
-    Value = CONCAT2($ORIGIN,/LibreOfficePython.framework);
+    Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework";
   #else
     Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
   #endif
@@ -57,7 +57,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
 #else
   #ifdef UNX
     #ifdef MACOSX
-    #define FRAMEWORKLIB CONCAT3($ORIGIN,/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
+    #define FRAMEWORKLIB CONCAT3($ORIGIN,/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
     Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
 		   /lib-dynload FRAMEWORKLIB,
 		   /lib-tk FRAMEWORKLIB,