From 2ffa346eff4fe5de22dcd8d0fe23ad97cc7b19a2 Mon Sep 17 00:00:00 2001
From: Viktor Tarasov <viktor.tarasov@gmail.com>
Date: Tue, 14 Jun 2011 14:56:49 +0200
Subject: [PATCH] OpenSC.msi: install opensc.dll into the 'tools' directory

Now the DLLs installed into the 'system' directory are static.
Only opensc tools depend on opensc.dll.
---
 win32/OpenSC.wxs.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/win32/OpenSC.wxs.in b/win32/OpenSC.wxs.in
index 046de2ed..bfcefc90 100644
--- a/win32/OpenSC.wxs.in
+++ b/win32/OpenSC.wxs.in
@@ -52,9 +52,6 @@
         <Component Id="opensc_pkcs11.dll" Guid="*" Win64="$(var.Win64YesNo)">
           <File Source="$(var.SOURCE_DIR)\src\pkcs11\opensc-pkcs11.dll" Vital="yes"/>
         </Component>
-        <Component Id="opensc.dll" Guid="*" Win64="$(var.Win64YesNo)">
-          <File Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" Vital="yes"/>
-        </Component>
         <Component Id="opensc_minidriver.dll" Guid="*" Win64="$(var.Win64YesNo)">
           <File Source="$(var.SOURCE_DIR)\src\minidriver\opensc-minidriver.dll" Vital="yes"/>
         </Component>
@@ -75,6 +72,9 @@
             </Component>
             <!-- Tools have their own folder -->
             <Directory Id="INSTALLDIR_TOOLS" Name="tools">
+              <Component Id="opensc.dll" Guid="*" Win64="$(var.Win64YesNo)">
+                <File Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" Vital="yes"/>
+              </Component>
               <Component Id="opensc_explorer.exe" Guid="*" Win64="$(var.Win64YesNo)">
                 <File Source="$(var.SOURCE_DIR)\src\tools\opensc-explorer.exe" Vital="yes"/>
               </Component>