Further work on the "Mac-like app structure" option

Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.

Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4

4 files changed, 28 insertions, 15 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8ea797982a77..665b8bfedf76 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -135,7 +135,9 @@ Directory gid_Brand_Dir_Program_Shell
 End
 
 Directory gid_Brand_Dir_Readme
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
 #else
     ParentID = gid_Dir_Brand_Root;
@@ -485,7 +487,9 @@ End
 
 File gid_Brand_File_Html_Thirdpartylicensereadme
     Name = "LICENSE.html";
-#ifdef MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
@@ -494,7 +498,7 @@ File gid_Brand_File_Html_Thirdpartylicensereadme
     TXT_FILE_BODY;
 End
 
-#if defined UNX && !defined ENABLE_MACOSX_SANDBOX
+#if defined UNX && !defined ENABLE_MACOSX_SANDBOX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
 File gid_Brand_File_Gdb_Trace
     TXT_FILE_BODY;
@@ -591,7 +595,7 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
-#if defined MACOSX && !defined ENABLE_MACOSX_SANDBOX
+#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 Unixlink gid_Brand_Unixlink_Unopkg
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -1400,7 +1404,9 @@ End
 
 File gid_License_Txt
   TXT_FILE_BODY;
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
@@ -1416,7 +1422,9 @@ End
 
 File gid_License_Odt
     BIN_FILE_BODY;
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
@@ -1427,7 +1435,9 @@ End
 
 File gid_Credits_Odt
     BIN_FILE_BODY;
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
@@ -1438,7 +1448,9 @@ End
 
 File gid_Apache_Notice
     BIN_FILE_BODY;
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    Dir = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 3a099a25293e..36d652290598 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -112,7 +112,9 @@ End
 #endif
 
 Directory gid_Dir_User
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
 #else
     ParentID = gid_Dir_Brand_Root;
@@ -357,7 +359,9 @@ Directory gid_Dir_Share_Fingerprint
 End
 
 Directory gid_Dir_Help
-#if defined MACOSX
+#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+    ParentID = gid_Dir_Bundle_Contents_Resources;
+#elif defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
 #else
     ParentID = gid_Dir_Brand_Root;
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 99e65909239f..2df138ab3e7d 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -19,7 +19,6 @@
 #include "macros.inc"
 
 #ifdef UNX
-#ifndef ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 #ifndef SYSTEM_ICU
 
 Shortcut gid_Shortcut_Lib_Icudata
@@ -59,8 +58,6 @@ End
 
 #endif
 
-#endif
-
 #ifdef MACOSX
 
 #ifdef SOLAR_JAVA
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 939bd3caf395..08b60f66f38b 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -18,10 +18,10 @@
 
 #include "macros.inc"
 
-#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-
 #include "AutoInstall/ure"
 
+#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+
 Directory gid_Dir_Ure_Bin
 #if defined MACOSX
     ParentID = gid_Dir_UreLink;