[cpp-sp COMMIT] /branches/REL_2/msi/WiX/MergeModules/MergeModules.make

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec  4 23:32:57 2012
New Revision: 3828

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3828&view=rev
Log:
Update libcurl names

Modified:
    branches/REL_2/msi/WiX/MergeModules/MergeModules.make

Modified: branches/REL_2/msi/WiX/MergeModules/MergeModules.make
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/MergeModules.make?rev=3828&r1=3827&r2=3828&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/MergeModules.make (original)
+++ branches/REL_2/msi/WiX/MergeModules/MergeModules.make Tue Dec  4 23:32:57 2012
@@ -23,7 +23,7 @@
 	light Curl-x64.wixobj
 	del ..\*.msi
 
-Curl-x64.wixobj: Curl-x64.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll
+Curl-x64.wixobj: Curl-x64.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl5.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurl5d.dll
 	wixcop -indent:2 Curl-x64.wxs 
 	candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)
 
@@ -31,7 +31,7 @@
 	light Curl-x86.wixobj
 	del ..\*.msi
 
-Curl-x86.wixobj: Curl-x86.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll 
+Curl-x86.wixobj: Curl-x86.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl5.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurl5d.dll 
 	wixcop -indent:2 Curl-x86.wxs 
 	candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)