Changeset 38779 in vbox for trunk/src/VBox

Timestamp:

Sep 16, 2011 1:58:09 PM (13 years ago)

Author:

vboxsync

Message:

MSI dependency fixes.

File:

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

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

@@ -382 +382 @@
         , $(VBOX_MSI_DEPENDENCIES))
 endif
+ifdef VBOX_WITH_EXTPACK_PUEL
+ VBOX_MSI_DEPENDENCIES := $(filter-out $(PATH_OUT)/bin/VBoxVRDP$(VBOX_SUFF_DLL), $(VBOX_MSI_DEPENDENCIES))
+endif
 
 # Add dependencies that makes sure necessary bits gets built since
 # VBOX_MSI_DEPENDENCIES will be zero the first time around.
 # For combined packages we always use the .ISO from the amd64 build.
+VBOX_MSI_DEPENDENCIES := $(filter-out %/VBoxGuestAdditions.iso, $(VBOX_MSI_DEPENDENCIES))
 ifdef VBOX_WITH_COMBINED_PACKAGE
  VBOX_MSI_DEPENDENCIES += \
@@ -391 +395 @@
 else
  VBOX_MSI_DEPENDENCIES += \
-        $(if $(VBOX_WITH_ADDITIONS_PACKING),$(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.iso)
+        $(if $(VBOX_WITH_ADDITIONS_PACKING),$(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso)
 endif