Changeset 77327 in vbox for trunk/src/VBox/Installer

Timestamp:

Feb 15, 2019 10:09:01 AM (6 years ago)

Author:

vboxsync

Message:

Installer/win: fix escaping (was showing up in the MSM case, but the issue was also present in the regular one, masked by lack of "" which is now also made consistent)

File:

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

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

@@ -569 +569 @@
                         | $$$$(dir $$$$@) $(if-expr "$(lang)" != "en_US",, \
                         $(VBOX_WIN_INST_REPACK_DIR)/ $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ )
-        $(QUIET)$(RM) -f -- $@  "$(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix"
+        $(QUIET)$(RM) -f -- "$$@"  "$(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix"
         $(REDIRECT) \
                 -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \
@@ -716 +716 @@
                 $(VBOX_VERSION_STAMP) \
                 | $$$$(dir $$$$@) $(VBOX_WIN_INST_REPACK_DIR)/
-        $(QUIET)$(RM) -f -- "$@" "$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix"
+        $(QUIET)$(RM) -f -- "$$@" "$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix"
         $(REDIRECT) \
                 -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \