Changeset 52909 in vbox for trunk/src

Timestamp:

Oct 1, 2014 5:59:51 AM (11 years ago)

Author:

vboxsync

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

96341

Message:

Config.kmk,Makefile.kmk: Disable merge module installers by default, whoever wants to have them can have the pleasure of enabling them manually or locally.

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (1 diff)

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

@@ -51 +51 @@
 #
 ifndef VBOX_INSTALLER_LANGUAGES
-VBOX_INSTALLER_LANGUAGES  = en_US de_DE fr_FR it_IT zh_TW
-VBOX_INSTALLER_LANGUAGES += $(VBOX_INSTALLER_ADD_LANGUAGES)
+ ifdef VBOX_WITH_MSM_INSTALL ## @todo Dunno why this has to be this way, ask Andy.
+  VBOX_INSTALLER_LANGUAGES = en_US
+ else
+  VBOX_INSTALLER_LANGUAGES  = en_US de_DE fr_FR it_IT zh_TW
+  VBOX_INSTALLER_LANGUAGES += $(VBOX_INSTALLER_ADD_LANGUAGES)
+ endif
 endif