Unify the MinGW / native Win temporary name here.

2 files changed, 19 insertions, 31 deletions

diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 45e841028388..858ab1094dfa 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -23,37 +23,31 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
-crashrepcom := crashrep_com
-else
-crashrepcom := crashrep.com
-endif
+$(eval $(call gb_Executable_Executable,crashrep_com))
 
-$(eval $(call gb_Executable_Executable,$(crashrepcom)))
+$(eval $(call gb_Executable_set_targettype_gui,crashrep_com,NO))
 
-$(eval $(call gb_Executable_set_targettype_gui,$(crashrepcom),NO))
+$(eval $(call gb_Executable_add_precompiled_header,crashrep_com,desktop/inc/pch/precompiled_desktop.hxx))
 
-$(eval $(call gb_Executable_add_precompiled_header,$(crashrepcom),desktop/inc/pch/precompiled_desktop.hxx))
-
-$(eval $(call gb_Executable_set_include,$(crashrepcom),\
+$(eval $(call gb_Executable_set_include,crashrep_com,\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/inc/pch \
 ))
 
-$(eval $(call gb_Executable_add_defs,$(crashrepcom),\
+$(eval $(call gb_Executable_add_defs,crashrep_com,\
     $(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,$(crashrepcom),\
+$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\
     user32 \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,$(crashrepcom),\
+$(eval $(call gb_Executable_add_exception_objects,crashrep_com,\
     desktop/win32/source/guistdio/guistdio \
 ))
 
-# the resulting executable is called $(crashrepcom).exe, copy it to crashrep.com
-$(eval $(call gb_Package_Package,$(crashrepcom),$(OUTDIR)/bin))
-$(eval $(call gb_Package_add_file,$(crashrepcom),bin/crashrep.com,$(crashrepcom).exe))
+# the resulting executable is called crashrep_com.exe, copy it to crashrep.com
+$(eval $(call gb_Package_Package,crashrep_com,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,crashrep_com,bin/crashrep.com,crashrep_com.exe))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
index 54106bbf9671..ee735094ee03 100644
--- a/desktop/Executable_unopkg.com.mk
+++ b/desktop/Executable_unopkg.com.mk
@@ -23,33 +23,27 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
-unopkgcom := unopkg_com
-else
-unopkgcom := unopkg.com
-endif
+$(eval $(call gb_Executable_Executable,unopkg_com))
 
-$(eval $(call gb_Executable_Executable,$(unopkgcom)))
+$(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO))
 
-$(eval $(call gb_Executable_set_targettype_gui,$(unopkgcom),NO))
+$(eval $(call gb_Executable_add_precompiled_header,unopkg_com,desktop/inc/pch/precompiled_desktop.hxx))
 
-$(eval $(call gb_Executable_add_precompiled_header,$(unopkgcom),desktop/inc/pch/precompiled_desktop.hxx))
-
-$(eval $(call gb_Executable_set_include,$(unopkgcom),\
+$(eval $(call gb_Executable_set_include,unopkg_com,\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/inc/pch \
 ))
 
-$(eval $(call gb_Executable_add_defs,$(unopkgcom),\
+$(eval $(call gb_Executable_add_defs,unopkg_com,\
     $(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,$(unopkgcom),\
+$(eval $(call gb_Executable_add_exception_objects,unopkg_com,\
     desktop/win32/source/guistdio/unopkgio \
 ))
 
-# the resulting executable is called $(unopkgcom).exe, copy it to unopkg.com
-$(eval $(call gb_Package_Package,$(unopkgcom),$(OUTDIR)/bin))
-$(eval $(call gb_Package_add_file,$(unopkgcom),bin/unopkg.com,$(unopkgcom).exe))
+# the resulting executable is called unopkg_com.exe, copy it to unopkg.com
+$(eval $(call gb_Package_Package,unopkg_com,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,unopkg_com,bin/unopkg.com,unopkg_com.exe))
 
 # vim: set ts=4 sw=4 et: