oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Windows: Optionally include Kerberos shim library into installer

Browse Source
This commit is contained in:
Asanka C. Herath
2010-11-11 00:27:03 -05:00
parent 80211ca0c8
commit 5e7d970774
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/windows/installer/NTMakefile
View File

@@ -112,6 +112,11 @@ THIRDPARTYOBJS=$(INSTDIR)\apicache.wixobj $(INSTDIR)\lsacache.wixobj
THIRDPARTYOPT=-dApiCache=1 -dLsaCache=1 THIRDPARTYOPT=-dApiCache=1 -dLsaCache=1
!endif !endif
!ifdef MKSHIMDIR
THIRDPARTYOBJS=$(THIRDPARTYOBJS) $(MKSHIMDIR)\out\dest_$(OUTDIR)\install\MKShim.wixlib
THIRDPARTYOPT=$(THIRDPARTYOPTS) -dMKShim=1
!endif
INSTALLER=$(INSTDIR)\Heimdal-$(CPU)$(DEBUGOPT)-$(VERSIOND).msi INSTALLER=$(INSTDIR)\Heimdal-$(CPU)$(DEBUGOPT)-$(VERSIOND).msi
$(INSTALLER): $(OBJ)\heimdal-installer.wixobj $(MERGEMOD) $(THIRDPARTYOBJS) \ $(INSTALLER): $(OBJ)\heimdal-installer.wixobj $(MERGEMOD) $(THIRDPARTYOBJS) \

4
packages/windows/installer/heimdal-installer.wxs
View File

@@ -311,6 +311,10 @@
<ComponentGroupRef Id='comp.Heimdal.Thirdparty' /> <ComponentGroupRef Id='comp.Heimdal.Thirdparty' />
<?endif?> <?endif?>
<?ifdef MKShim ?>
<ComponentGroupRef Id='comp.Heimdal.MKShim' />
<?endif?>
</Feature> </Feature>
<!-- Properties for Add/Remove Programs --> <!-- Properties for Add/Remove Programs -->