summaryrefslogtreecommitdiffstats
path: root/src/windows/installer
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2011-12-12 20:45:23 +0000
committerTom Yu <tlyu@mit.edu>2011-12-12 20:45:23 +0000
commita569d8fba5b99cb7e57889b34c0c66d5f6c6b056 (patch)
tree4e4d0ac3eee774b2e5f4e96a0a38281c61c105e6 /src/windows/installer
parent937651bc6df0fc90ff500061cbcee0e8ed0724ed (diff)
downloadkrb5-a569d8fba5b99cb7e57889b34c0c66d5f6c6b056.tar.gz
krb5-a569d8fba5b99cb7e57889b34c0c66d5f6c6b056.tar.xz
krb5-a569d8fba5b99cb7e57889b34c0c66d5f6c6b056.zip
kfw fixes: install xpprof32
TODO: xpprof64! Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com> ticket: 7050 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25552 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/installer')
-rw-r--r--src/windows/installer/wix/features.wxi2
-rw-r--r--src/windows/installer/wix/files.wxi6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index 609769b59b..c9549f35d2 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -75,7 +75,7 @@
<ComponentRef Id="cmf_ms2mit_exe" />
<ComponentRef Id="cmf_mit2ms_exe" />
<ComponentRef Id="cmf_wshelp32_dll" />
-<!-- <ComponentRef Id="cmf_xpprof32_dll" /> -->
+ <ComponentRef Id="cmf_xpprof32_dll" />
<ComponentRef Id="cmf_leashw32_dll" />
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 9b4e0f5443..b8ac79e4d6 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -286,9 +286,9 @@
<Component Win64="$(var.Win64)" Id="cmf_wshelp32_dll" Guid="$(var.cmf_wshelp32_dll_guid)" DiskId="1">
<File Id="fil_wshelp32_dll" Name="$(var.cmf_wshelp32_dll_name)" KeyPath="yes" />
</Component>
-<!-- <Component Win64="$(var.Win64)" Id="cmf_xpprof32_dll" Guid="$(var.cmf_xpprof32_dll_guid)" DiskId="1">
+ <Component Win64="$(var.Win64)" Id="cmf_xpprof32_dll" Guid="$(var.cmf_xpprof32_dll_guid)" DiskId="1">
<File Id="fil_xpprof32_dll" Name="$(var.cmf_xpprof32_dll_name)" KeyPath="yes" />
- </Component> -->
+ </Component>
<!-- Debug symbols -->
<?ifdef DebugSyms?>
@@ -594,7 +594,7 @@
<File Id="fil_krbcc32_lib" Name="krbcc32.lib" />
<File Id="fil_leashw32_lib" Name="leashw32.lib" />
<File Id="fil_wshelp32_lib" Name="wshelp32.lib" />
-<!-- <File Id="fil_xpprof32_lib" Name="xpprof32.lib" /> -->
+ <File Id="fil_xpprof32_lib" Name="xpprof32.lib" />
</Component>
</Directory>
<?endif?>