Changeset 98436 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2023 12:44:58 PM (23 months ago)

Author:

vboxsync

Message:

Installer/win/Makefile.kmk: Simplifications so scm can grok it better. bugref:10348

File:

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

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

@@ -593 +593 @@
 endef
 
-$(if-expr defined(VBOX_WITH_MSM_INSTALL), \
-        $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
-                $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
-                        $(eval $(def_vbox_link_msm)))),)
+ifdef VBOX_WITH_MSM_INSTALL
+ $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \
+        $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \
+                $(eval $(def_vbox_link_msm)))),)
+endif
 
 
@@ -1109 +1110 @@
 VBOX_INS_PROD_ARCH.x86   = Intel
 VBOX_INS_PROD_ARCH := $(VBOX_INS_PROD_ARCH.$(KBUILD_TARGET_ARCH))
-$(if $(VBOX_INS_PROD_ARCH),,$(error VBOX_INS_PROD_ARCH is empty!))
+ifeq ($(VBOX_INS_PROD_ARCH),)
+ $(error VBOX_INS_PROD_ARCH is empty!)
+endif
 VBOX_INS_PROD_LANG := 7="$(VBOX_INS_PROD_ARCH);1033
 $(foreach lang, $(filter-out en_US,$(VBOX_INSTALLER_LANGUAGES))\