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

Timestamp:

Feb 20, 2019 1:30:33 PM (6 years ago)

Author:

vboxsync

Message:

Installer/win: fix sed magic for MSM re-packing. bugref:8691

File:

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

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

@@ -603 +603 @@
                 $(if-expr defined(VBOX_WITH_MSM_INSTALL), \
                         $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-                                -E 'VBOX_WIN_INST_MERGE_$(toupper $(module))=$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm'),) \
+                                -E 'VBOX_WIN_INST_MERGE_$(toupper $(module))=$(subst /,\,$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm')),) \
                 -E 'VBOX_WINDOWS_ICON_FILE=$(subst /,\,$(VBOX_WINDOWS_ICON_FILE))' \
                 -E 'VBOX_QT_INFIX=$(VBOX_QT_INFIX)' \
@@ -652 +652 @@
                 -e 's,$(subst /,\\,$(PATH_ROOT))\\doc\\,files-VirtualBox_$(lang)\\,g' \
                 -e 's,$(subst /,\\,$(VBOX_PATH_WIN_INST_SRC))\\Binary\\,files-VirtualBox_$(lang)\\,g' \
+                -e 's,$(subst /,\\,$(VBOX_WIN_INST_OUT_DIR))\\,,g' \
                 -e 's,$(subst /,\\,$(dir $(VBOX_WINDOWS_ICON_FILE))),files-VirtualBox_$(lang)\\,g' \
                 --output "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix" \