10 files changed, 27 insertions, 48 deletions
diff --git a/Repository.mk b/Repository.mk
index 93952d27fc76..ac049f3e8650 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -73,8 +73,11 @@ $(eval $(call gb_Helper_register_executables,SDK, \
 	) \
 ))
 
+$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)),gengal) \
+))
+
 $(eval $(call gb_Helper_register_executables,OOO, \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)),gengal.bin) \
 	gnome-open-url.bin \
 	$(if $(filter YES,$(ENABLE_NPAPI_INTO_BROWSER)),nsplugin) \
 	$(if $(filter MACOSX,$(OS)),officeloader) \
@@ -93,7 +96,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg.bin) \
 	$(if $(filter WNT,$(OS)), \
 		crashrep_com \
-		gengal \
 		gcc-wrapper \
 		g++-wrapper \
 		guiloader \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e70c3f9a1111..88724b41f8f3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2805,7 +2805,7 @@ endef
 
 # Better duplication with gb_Gallery__UNO_COMPONENTS than nothing.
 # This is used to determine what we need for 'build' platform.
-define gb_Executable__register_gengal_impl
+define gb_Executable__register_gengal
 $(call gb_Executable_add_runtime_dependencies,$(1),\
 	$(foreach component, \
 		comphelper/util/comphelp \
@@ -2836,12 +2836,6 @@ $(call gb_Executable_add_runtime_dependencies,$(1),\
 )
 endef
 
-ifeq ($(OS),WNT)
-gb_Executable__register_gengal = $(call gb_Executable__register_gengal_impl,gengal)
-else
-gb_Executable__register_gengal.bin = $(call gb_Executable__register_gengal_impl,gengal.bin)
-endif
-
 ifneq ($(SYSTEM_ICU),YES)
 
 define gb_Executable__register_gendict
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 030384a1f57c..3452f67847b6 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -23,6 +23,7 @@ gb_Executable_FILENAMES := $(foreach group,$(gb_Executable_VALIDGROUPS),\
 	$(foreach exe,$(gb_Executable_$(group)),$(exe):$(exe)$(gb_Executable_EXT)))
 
 gb_Executable_FILENAMES := $(patsubst uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
+gb_Executable_FILENAMES := $(patsubst gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES))
 
 gb_Executable_FILENAMES_FOR_BUILD := $(subst $(gb_Executable_EXT),$(gb_Executable_EXT_for_build),$(gb_Executable_FILENAMES))
 
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 3dfb56a2587e..66edd78ecf5a 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 99f0d98d30d9..86b4b5462188 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -453,6 +453,14 @@ End
         Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
     End
 
+#define LIBO_EXECUTABLE(id,name) \
+    File id \
+        BIN_FILE_BODY; \
+        Dir = gid_Brand_Dir_Program; \
+        Name = name; \
+        Styles = (PACKED); \
+    End
+
 #define GALLERY_NAME(id) \
 
 #define GALLERY_FILELIST(id) \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a191c49a7616..256636de3a84 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -128,17 +128,6 @@ File gid_File_Exe_Nsplugin
 End
 #endif
 
-File gid_File_Bin_Gengal
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-  #ifdef UNX
-    Name = "gengal.bin";
-  #else
-    Name = "gengal.exe";
-  #endif
-End
-
 File gid_File_Bin_UIPreviewer
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index bc3eda5d6395..52894dd323fc 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -84,7 +84,6 @@ Module gid_Module_Root_Files_2
 	Files = (gid_File_shell_scripts,
 	gid_File_Bin_Pluginapp,
 	gid_File_Bin_Senddoc,
-	gid_File_Bin_Gengal,
 	gid_File_Script_Gengal,
 	gid_File_Bin_Spadmin_Bin,
 	gid_File_Bin_Uri_Encode,
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index e240892f3a89..928ba92a5ebe 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
 			SAL_USE_VCLPLUGIN=svp \
 		)) \
-		$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
+		$(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \
 			$(call gb_Gallery__make_env_args) \
 			--build-tree \
 			--destdir $(GALLERY_BASEDIR) \
@@ -105,7 +105,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_Gallery_get_target,%) : \
-		$(call gb_Executable_get_runtime_dependencies,$(gb_GENGAL)) \
+		$(call gb_Executable_get_runtime_dependencies,gengal) \
 		$(gb_Gallery_EXTRA_DEPENCENCIES)
 	$(call gb_Gallery__command,$@,$*)
 
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index 0362c73a8477..76d94d83ff59 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -7,13 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-
-ifeq (,$(filter WNT,$(OS_FOR_BUILD)))
-	gb_GENGAL = gengal.bin
-else # windows appends the .exe
-	gb_GENGAL = gengal
-endif
-
 # Tools we need to build for cross-compiling
 gb_BUILD_TOOLS = \
 	$(foreach executable, \
@@ -44,7 +37,7 @@ gb_BUILD_TOOLS = \
 		ulfex \
 		xrmex \
 		$(call gb_Helper_optional_for_host,DESKTOP, \
-			$(gb_GENGAL) \
+			gengal \
 			HelpIndexer \
 			HelpLinker \
 		) \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 7be4ace7a452..55cc2f140a58 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -17,26 +17,19 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-ifeq ($(OS),WNT)
-svx_GENGALBIN := gengal
-else
-svx_GENGALBIN := gengal.bin
-endif
-
-
-$(eval $(call gb_Executable_Executable,$(svx_GENGALBIN)))
+$(eval $(call gb_Executable_Executable,gengal))
 
-$(eval $(call gb_Executable_set_include,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_set_include,gengal,\
     $$(INCLUDE) \
     -I$(SRCDIR)/svx/inc/ \
     -I$(SRCDIR)/svx/inc/pch \
 ))
 
-$(eval $(call gb_Executable_use_external,$(svx_GENGALBIN),boost_headers))
+$(eval $(call gb_Executable_use_external,gengal,boost_headers))
 
-$(eval $(call gb_Executable_use_sdk_api,$(svx_GENGALBIN)))
+$(eval $(call gb_Executable_use_sdk_api,gengal))
 
-$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_use_libraries,gengal,\
     basegfx \
     sal \
     tl \
@@ -51,16 +44,16 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_add_exception_objects,gengal,\
     svx/source/gengal/gengal \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_use_static_libraries,gengal,\
     vclmain \
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_use_system_win32_libs,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_use_system_win32_libs,gengal,\
 	kernel32 \
 	msvcrt \
 	oldnames \
@@ -69,7 +62,7 @@ $(eval $(call gb_Executable_use_system_win32_libs,$(svx_GENGALBIN),\
 endif
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_libs,$(svx_GENGALBIN),\
+$(eval $(call gb_Executable_add_libs,gengal,\
 	-ldl \
 	-lpthread \
 ))