13 files changed, 32 insertions, 58 deletions
diff --git a/Repository.mk b/Repository.mk
index f879375d8e60..da317f131ec1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -804,10 +804,36 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
 	) \
 ))
 
+ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	xmlsec \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,base_brand,\
+	desktop_sbase_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,calc_brand,\
+	desktop_scalc_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,draw_brand,\
+	desktop_sdraw_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,impress_brand,\
+	desktop_simpress_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,math_brand,\
+	desktop_smath_sh \
+))
+
+$(eval $(call gb_Helper_register_packages_for_install,writer_brand,\
+	desktop_swriter_sh \
+))
+endif # GUIBASE=unx
+
 # External executables
 $(eval $(call gb_ExternalExecutable_register_executables,\
 	genbrk \
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index d1af15a6ee5d..d98fd8474194 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -18,15 +18,6 @@
 
 #include "macros.inc"
 
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Sbase
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "sbase";
-    Styles = (PACKED);
-End
-#endif
-
 STD_RES_FILE( gid_File_Res_Abp, abp)
 
 STD_RES_FILE( gid_File_Res_Dbp, dbp)
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index c593e7e39724..0413bc40522a 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -51,7 +51,7 @@ Module gid_Module_Brand_Prg_Base
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (auto_base_brand_ALL,gid_File_Exe_Sbase);
+    Files = (auto_base_brand_ALL);
 End
 
 Module gid_Module_Langpack_Base_Template
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 390fd0e3f65f..eae330c8989b 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -41,15 +41,6 @@ File gid_File_Help_Scalc_Zip
 End
 #endif
 
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Scalc
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "scalc";
-    Styles = (PACKED);
-End
-#endif
-
 #if defined(WITH_LPSOLVER)
 
 STD_RES_FILE( gid_File_Res_Solver, solver)
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 47d64265929d..a1ca74bd8709 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -60,7 +60,7 @@ Module gid_Module_Brand_Prg_Calc
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (auto_calc_brand_ALL,gid_File_Exe_Scalc);
+    Files = (auto_calc_brand_ALL);
 End
 
 Module gid_Module_Langpack_Calc_Template
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 4f8d610d7feb..49d6d5dd40dc 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -33,11 +33,3 @@ File gid_File_Help_Sdraw_Zip
 End
 #endif
 
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Sdraw
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "sdraw";
-    Styles = (PACKED);
-End
-#endif
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index a2db15d9aac0..36ef3a77631d 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -50,7 +50,7 @@ Module gid_Module_Brand_Prg_Draw
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (auto_draw_brand_ALL,gid_File_Exe_Sdraw);
+    Files = (auto_draw_brand_ALL);
 End
 
 Module gid_Module_Langpack_Draw_Template
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 5cb4126fc4b9..81ad53c30727 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -33,15 +33,6 @@ File gid_File_Help_Simpress_Zip
 End
 #endif
 
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Simpress
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "simpress";
-    Styles = (PACKED);
-End
-#endif
-
 // configuration files for custom animation effects
 
 File gid_File_sd_xml
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 38e445f40003..54ee6d76cf00 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -53,7 +53,7 @@ Module gid_Module_Brand_Prg_Impress
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (auto_impress_brand_ALL,gid_File_Exe_Simpress);
+    Files = (auto_impress_brand_ALL);
 End
 
 Module gid_Module_Langpack_Impress_Template
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 6fab35ac0c41..a7a75b5e643b 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -35,11 +35,3 @@ File gid_File_Help_Smath_Zip
 End
 #endif
 
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Smath
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "smath";
-    Styles = (PACKED);
-End
-#endif
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index c281437f2a57..a683e479d9b6 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -52,7 +52,7 @@ Module gid_Module_Brand_Prg_Math
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (auto_math_brand_ALL,gid_File_Exe_Smath);
+    Files = (auto_math_brand_ALL);
 End
 
 Module gid_Module_Langpack_Math_Template
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 280e40afa572..28966fc7b696 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -18,15 +18,6 @@
 
 #include "macros.inc"
 
-#if !defined MACOSX && !defined WNT
-File gid_File_Exe_Swriter
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "swriter";
-    Styles = (PACKED);
-End
-#endif
-
 #if defined WITH_HELP
 File gid_File_Help_Swriter_Zip
     Dir = FILELIST_DIR;
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 987a7c7eb79e..b0a0d3ac516d 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -56,7 +56,7 @@ Module gid_Module_Brand_Prg_Wrt
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (auto_writer_brand_ALL,gid_File_Exe_Swriter);
+    Files = (auto_writer_brand_ALL);
 End
 
 Module gid_Module_Langpack_Writer_Template