Changeset 65996 in vbox

Timestamp:

Mar 8, 2017 4:52:52 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

113842

Message:

Installer/windows: export fix

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxMergeApp.wxi (modified) (2 diffs)

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

@@ -580 +580 @@
                 -E 'VBOX_WITH_VRDP=$(if-expr defined(VBOX_WITH_VRDP) && !defined(VBOX_WITH_EXTPACK_PUEL),yes,no)' \
                 -E 'VBOX_WITH_WEBSERVICES=$(if $(VBOX_WITH_WEBSERVICES),yes,no)' \
+                -E 'VBOX_WITH_UNATTENDED=$(if $(VBOX_WITH_UNATTENDED),yes,no)' \
                 -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
                 -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -439 +439 @@
     </Component>
 
+<?if $(env.VBOX_WITH_UNATTENDED) = "yes" ?>
     <!-- Unattended templates -->
     <Directory Id="dir_VBoxUnattendedTemplates" Name="unattended_templates">
@@ -459 +460 @@
         </Component>
     </Directory>
+<?endif?>
 
 </Include>