Changeset 107004 in vbox for trunk/src/VBox/Installer/win/Makefile.kmk

Timestamp:

Nov 14, 2024 2:46:15 PM (2 months ago)

Author:

vboxsync

Message:

Installer/win/Makefile.kmk: Fixed regressions from r165936, mostly. [fix] jiraref:VBP-1442

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -719 +719 @@
                 $(if-expr defined(VBOX_WITH_MSM_INSTALL), \
                         $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-                                $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm), \
+                                $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm) \
+                        , \
                         $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \
                         $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
@@ -728 +729 @@
                         $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
                         $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
-                        $(VBOX_MSI_DEPENDENCIES),) \
+                        $(VBOX_MSI_DEPENDENCIES)) \
                 $(VBOX_VERSION_STAMP) \
                 | $$$$(dir $$$$@) $(if-expr "$(lang)" != "en_US",, \