From 7236505bf064cac9e306a6d4e83b3da23fe44a0a Mon Sep 17 00:00:00 2001 From: "Asanka C. Herath" Date: Wed, 15 Jun 2011 00:48:31 -0400 Subject: [PATCH] Windows: Multiplatform installer should have a different name. --- packages/windows/installer/NTMakefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile index 77a2491fc..03c368b63 100644 --- a/packages/windows/installer/NTMakefile +++ b/packages/windows/installer/NTMakefile @@ -153,8 +153,10 @@ CANDLEOPTS=$(CANDLEOPTS) -dTarget64 \ !ifdef MULTIPLATFORM_INSTALLER CANDLEOPTS=$(CANDLEOPTS) -dTarget32 +TYPEOPT=-full !else ! message Excluding 32-bit components from installer +TYPEOPT= !endif INSTDEPS=$(INSTDIR32)\Heimdal.msm \ @@ -187,16 +189,17 @@ THIRDPARTYOBJS=$(THIRDPARTYOBJS) $(INSTDIR32)\MKShim.wixlib !endif !endif -INSTALLER=$(INSTDIR)\Heimdal-$(CPU)$(DEBUGOPT)-$(VERSIOND).msi +INSTALLER=$(INSTDIR)\Heimdal-$(CPU)$(DEBUGOPT)$(TYPEOPT)-$(VERSIOND).msi +WIXOBJ=$(OBJ)\heimdal-installer$(TYPEOPT).wixobj -$(INSTALLER): $(OBJ)\heimdal-installer.wixobj $(THIRDPARTYOBJS) $(INSTDEPS) lang\en-us.wxl - $(LIGHT) -out $@ $(OBJ)\heimdal-installer.wixobj $(THIRDPARTYOBJS) \ +$(INSTALLER): $(WIXOBJ) $(THIRDPARTYOBJS) $(INSTDEPS) lang\en-us.wxl + $(LIGHT) -out $@ $(WIXOBJ) $(THIRDPARTYOBJS) \ -sval -cultures:en-us -loc lang\en-us.wxl \ -dWixUILicenseRtf=lang\license-en-us.rtf \ -ext WixUIExtension $(_CODESIGN) -$(OBJ)\heimdal-installer.wixobj: heimdal-installer.wxs +$(WIXOBJ): heimdal-installer.wxs $(CANDLE) -arch $(PLATFORM) -o $@ heimdal-installer.wxs \ $(CANDLEOPTS) $(THIRDPARTYOPTS)