diff options
| author | Asanka C. Herath <asanka@google.com> | 2011-06-15 00:48:31 -0400 |
|---|---|---|
| committer | Asanka C. Herath <asanka@google.com> | 2011-06-15 01:55:21 -0400 |
| commit | 7236505bf064cac9e306a6d4e83b3da23fe44a0a (patch) | |
| tree | 3c5953bf657b75085a2b404112423dfa47fdc39e /packages | |
| parent | 8aaf3183ca973a03ee97b9f5b673a02ee71dc61d (diff) | |
Windows: Multiplatform installer should have a different name.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/windows/installer/NTMakefile | 11 |
1 files 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) |