opensc-msi: do not install libltdl
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5209 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
7ca921fc4a
commit
47b1c9a86d
|
@ -10,7 +10,7 @@ OpenSC.msi: OpenSC.wixobj
|
||||||
$(WIX_INSTALLED_PATH)\light.exe -sh -ext WixUIExtension $?
|
$(WIX_INSTALLED_PATH)\light.exe -sh -ext WixUIExtension $?
|
||||||
|
|
||||||
OpenSC.wixobj: OpenSC.wxs
|
OpenSC.wixobj: OpenSC.wxs
|
||||||
$(WIX_INSTALLED_PATH)\candle.exe -dSOURCE_DIR=$(TOPDIR) -dPATH_TO_LIBLTD3_DLL=$(LIBLTDL_DLL) $?
|
$(WIX_INSTALLED_PATH)\candle.exe -dSOURCE_DIR=$(TOPDIR) $?
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
del /Q *.msi *.wixobj *.wixpdb
|
del /Q *.msi *.wixobj *.wixpdb
|
||||||
|
|
|
@ -62,10 +62,6 @@
|
||||||
<File Id='OPENSC_DLL_FILE' Name='opensc.dll' DiskId='1'
|
<File Id='OPENSC_DLL_FILE' Name='opensc.dll' DiskId='1'
|
||||||
Source='$(var.SOURCE_DIR)\src\libopensc\opensc.dll' Vital='yes' KeyPath='yes' />
|
Source='$(var.SOURCE_DIR)\src\libopensc\opensc.dll' Vital='yes' KeyPath='yes' />
|
||||||
</Component>
|
</Component>
|
||||||
<Component Id='LIBLTDL3_DLL' Guid='7FB99A8F-D091-4EB4-8E82-9F89F943BCF7'>
|
|
||||||
<File Id='LIBLTDL3_DLL_FILE' Name='libltdl3.dll' DiskId='1'
|
|
||||||
Source='$(var.PATH_TO_LIBLTD3_DLL)' Vital='yes' KeyPath='yes' />
|
|
||||||
</Component>
|
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
<Directory Id='INSTALLDIR_ETC' Name='etc'>
|
<Directory Id='INSTALLDIR_ETC' Name='etc'>
|
||||||
|
@ -151,7 +147,6 @@
|
||||||
|
|
||||||
<ComponentRef Id='OPENSC_PKCS11_DLL' />
|
<ComponentRef Id='OPENSC_PKCS11_DLL' />
|
||||||
<ComponentRef Id='OPENSC_DLL' />
|
<ComponentRef Id='OPENSC_DLL' />
|
||||||
<ComponentRef Id='LIBLTDL3_DLL' />
|
|
||||||
|
|
||||||
<ComponentRef Id='OPENSC_CONF' />
|
<ComponentRef Id='OPENSC_CONF' />
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue