Windows: Install loose gssapi.dll with manifest

When installing the gssapi.dll within the Heimdal\bin directory
make sure to install the version that has the assembly manifest.
Otherwise, the DLL cannot find the heimdal.dll.

Change-Id: Idd6f8f00db718f8a764e1cfa9d06d188ab22a313

diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index c9624ec63eaf74134b3adda68607b2811451cc44..127c2dc91b1e33bfe9e420139cfc1a2b5616e1b6 100644 (file)
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -172,6 +172,7 @@ CANDLEOPTS= \
        -dDocDir=$(DOCDIR)                      \
        -dSrcDir=$(SRC)                         \
        -dPlatform=$(PLATFORM)                  \
+       -dAsmKrbName=$(ASMKRBNAME)              \
        -dPolPrefix=$(POLPREFIX)
 
 !if "$(CPU)"=="AMD64"

diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index a28ffe5816bdfffcd8ca48986477b17fea383009..68fb62af013586447932960f068ccef7e6d1dbe1 100644 (file)
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -201,7 +201,7 @@
       <Component Id='comp.gssdll'
                 Guid='$(var.GuidGssDll)'
                 Win64='$(var.Win64)'>
-       <File Name='gssapi.dll' KeyPath='yes' />
+       <File Name='gssapi.dll' KeyPath='yes' Source='$(var.BinDir)\$(var.AsmKrbName)\gssapi.dll' />
        <File Name='gssapi.pdb' />
       </Component>