Windows: Heimdal.Command.msm MULTIPLATFORM_INSTALL

When building a multiplatform installer 64-bit Heimdal.Command.msm
should not include the 32-bit components.

Change-Id: I5a3545d50edb69e982ea6b2febb45637764a8ca2

packages/windows/installer/NTMakefile

@@ -180,7 +180,7 @@ CANDLEOPTS=$(CANDLEOPTS) -dTarget64	\
 	-dRuntimeModule64=$(RUNTIMEMODULE64)	\
 
 !ifdef MULTIPLATFORM_INSTALLER
-CANDLEOPTS=$(CANDLEOPTS) -dTarget32
+CANDLEOPTS_MULTI= -dTarget32
 TYPEOPT=-full
 !else
 !  message Excluding 32-bit components from installer
@@ -221,7 +221,7 @@ $(INSTALLER): $(WIXOBJ) $(THIRDPARTYOBJS) $(INSTDEPS) lang\en-us.wxl
 
 $(WIXOBJ): heimdal-installer.wxs
 	$(CANDLE) -arch $(PLATFORM) -o $@ heimdal-installer.wxs \
-		$(CANDLEOPTS) $(THIRDPARTYOPTS)
+		$(CANDLEOPTS) $(CANDLEOPTS_MULTI) $(THIRDPARTYOPTS)
 
 !if exist(thirdparty\installer\heimdal-command.wxs)
 CMD_WXS=thirdparty\installer\heimdal-command.wxs