[vidalia-svn] r3030: Grab the Qt .dlls included in the Vidalia installer directly (vidalia/trunk/pkg/win32)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-09-01 21:51:40 -0400 (Mon, 01 Sep 2008)
New Revision: 3030

Modified:
   vidalia/trunk/pkg/win32/vidalia.nsi.in
Log:
Grab the Qt .dlls included in the Vidalia installer directly from the
configured Qt binary directory.


Modified: vidalia/trunk/pkg/win32/vidalia.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-09-02 01:39:36 UTC (rev 3029)
+++ vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-09-02 01:51:40 UTC (rev 3030)
@@ -136,14 +136,14 @@
   SectionIn RO
   
   ; Set output path to the installation directory.
-  SetOutPath $INSTDIR    
-  File "..\..\src\vidalia\${VIDALIA_EXEC}"
+  SetOutPath $INSTDIR
+  File "@Vidalia_BINARY_DIR@\src\vidalia\${VIDALIA_EXEC}"
   File "..\..\bin\mingwm10.dll"
-  File "..\..\bin\QtCore4.dll"
-  File "..\..\bin\QtGui4.dll"
-  File "..\..\bin\QtNetwork4.dll"
-  File "..\..\bin\QtXml4.dll"
   File "..\..\bin\ssleay32.dll"
+  File "@QT_BINARY_DIR@\QtCore4.dll"
+  File "@QT_BINARY_DIR@\QtGui4.dll"
+  File "@QT_BINARY_DIR@\QtNetwork4.dll"
+  File "@QT_BINARY_DIR@\QtXml4.dll"
   File "@Vidalia_SOURCE_DIR@\CREDITS"
   File "@Vidalia_SOURCE_DIR@\CHANGELOG"
   File "@Vidalia_SOURCE_DIR@\LICENSE"
@@ -155,7 +155,7 @@
 
   ; Include a prebuilt GeoIP cache
   SetOutPath "$APPDATA\Vidalia"
-  File "@CMAKE_CURRENT_SOURCE_DIR@\geoip-cache"
+  File "@Vidalia_SOURCE_DIR@\pkg\geoip-cache"
   
   ; Save the chosen language code
   WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General LanguageCode "$(LanguageCode)"