cleanup unfortunate license duplication

3 files changed, 23 insertions, 92 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5fe49e6d2498..34b75e310626 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -101,7 +101,10 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Xdg_QStart,
              gid_Brand_File_Share_Xdg_StartCenter,
              gid_Brand_File_Share_Xdg_Writer,
-             gid_Brand_File_Txt_Package);
+             gid_Brand_File_Txt_Package,
+	     gid_License_Txt,
+	     git_License_Odt,
+	     gid_Credits_Odt);
     Unixlinks = (gid_Brand_Unixlink_BasisLink,
                  gid_Brand_Unixlink_Program,
                  gid_Brand_Unixlink_Unopkg,
@@ -118,13 +121,10 @@ Module gid_Module_Langpack_Brand_Template
     InstallOrder = "1050";
     Dirs = (gid_Brand_Dir_Help,
             gid_Brand_Dir_Help_Isolanguage,
-            gid_Brand_Dir_License,
             gid_Brand_Dir_Program,
             gid_Brand_Dir_Program_Shell,
             gid_Brand_Dir_Program_Resource,
-            gid_Brand_Dir_Readme,
-            gid_Brand_Dir_Share,
-            gid_Brand_Dir_Share_Readme);
+            gid_Brand_Dir_Readme);
     Files = (gid_Brand_File_Res_Iso,
              gid_Brand_File_Res_Ooo,
              gid_Brand_File_Res_Oirm,
@@ -132,13 +132,9 @@ Module gid_Module_Langpack_Brand_Template
              gid_Brand_File_Help_C05_Scalc_Zip,
              gid_Brand_File_Help_C05_Sdraw_Zip,
              gid_Brand_File_Help_C05_Swriter_Zip,
-             gid_Brand_File_License_License,
-             gid_Brand_File_License_License_Small,
              gid_Brand_File_Readme_Readme,
              gid_Brand_File_Share_Registry_Cjk_Xcd,
              gid_Brand_File_Share_Registry_Korea_Xcd,
-             gid_Brand_File_Txt_License,
-             gid_Brand_File_Txt_License_Small,
              gid_Brand_File_Txt_Readme);
 End
 
@@ -173,15 +169,6 @@ Directory gid_Brand_Dir_Readme
     DosName = "readmes";
 End
 
-Directory gid_Brand_Dir_License
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Brand_Root;
-#endif
-    DosName = "licenses";
-End
-
 Directory gid_Brand_Dir_Help
 #if defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
@@ -210,11 +197,6 @@ Directory gid_Brand_Dir_Share_Config
     DosName = "config";
 End
 
-Directory gid_Brand_Dir_Share_Readme
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "readme";
-End
-
 Directory gid_Brand_Dir_Share_Extension
     ParentID = gid_Brand_Dir_Share;
     DosName = "extension";
@@ -1503,6 +1485,22 @@ File gid_Brand_File_Bin_Python
 End
 #endif
 
+File gid_License_Txt
+  TXT_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Brand_Dir_BasisLink;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+  #ifdef UNX
+    Name = "LICENSE";
+  #endif
+  #ifdef WNT
+    Name = "license.txt";
+  #endif
+    Styles = (PACKED);
+End
+
 File gid_License_Odt
     BIN_FILE_BODY;
 #if defined MACOSX
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index bd77922392ce..77aabc8232d3 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -29,45 +29,9 @@
 
 // Files
 
-File gid_Brand_File_Txt_License
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_ALL_LANG(Name, LICENSE);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_License_License
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_License;
-  #ifdef UNX
-    README_ALL_LANG(Name, LICENSE);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_Txt_Readme
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_ALL_LANG(Name, README);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_Brand_File_Readme_Readme
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Readme;
+  TXT_FILE_BODY;
+  Dir = gid_Brand_Dir_Readme;
   #ifdef UNX
     README_ALL_LANG(Name, README);
   #endif
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index de546e8d47ce..85c1030a1378 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -27,22 +27,6 @@
 
 #include "macros.inc"
 
-ScpAction scp_Copy_License_Txt
-  #ifdef UNX
-    README_ALL_LANG(Copy, LICENSE);
-    README_ALL_LANG(Name, LICENSE);
-  #else
-    README_TXT_ALL_LANG(Copy, license, txt);
-    README_TXT_ALL_LANG(Name, license, txt);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "licenses";
-  #else
-    Subdir = "LICENSEs";
-  #endif
-End
-
 #ifdef MACOSX
 ScpAction scp_Copy_Thirdpartylicense_Readme_Html
     Copy = "THIRDPARTYLICENSEREADME.html";
@@ -116,21 +100,6 @@ ScpAction scp_Copy_Xpd_Gif_Setup
     Subdir = "installdata/images";
 End
 
-// Setup license file
-ScpAction scp_Copy_Xpd_Html_License
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Html_License_En_Us
-  	Copy = "LICENSE_en-US.html";
-    Name = "LICENSE.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
 // Setup help files
 
 ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense