From 15d6ecddc6afaf760f3073f565ae773ff5a69497 Mon Sep 17 00:00:00 2001
From: martin <martin@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Sun, 17 Apr 2011 13:18:11 +0000
Subject: [PATCH] WindowsInstaller: One more fix for x64 installer: opensc.conf

c:\jenkins\workspace\OpenSC_win64_nightly\win32\OpenSC.wxs(61) : error LGHT0204 : ICE80: This 32BitComponent opensc.conf uses 64BitDirectory INSTALLDIR
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Windows Installer XML v3.6\bin\light.exe"' : return code '0xcc'

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5352 c6295689-39f2-0310-b995-f0e70906c6a9
---
 win32/OpenSC.wxs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win32/OpenSC.wxs.in b/win32/OpenSC.wxs.in
index 4f9e2e02..5155f27b 100644
--- a/win32/OpenSC.wxs.in
+++ b/win32/OpenSC.wxs.in
@@ -58,7 +58,7 @@
           <!-- Most of the stuff goes to the Program Files folder -->
           <Directory Id="INSTALLDIR" Name="OpenSC">
             <!-- opensc.conf sample goes to installation directory -->
-            <Component Id="opensc.conf" Guid="*">
+            <Component Id="opensc.conf" Guid="*" Win64="$(var.Win64YesNo)">
               <File Source="$(var.SOURCE_DIR)\etc\opensc.conf.in" KeyPath="yes"/>
               <!-- -->
               <RegistryKey Id="OpenscRegs" Root="HKLM" Key="Software\[Manufacturer]\[ProductName]" Action="createAndRemoveOnUninstall">