Mercurial > pidgin.yaz

changeset 6854:9e1bd25afa88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7399] installer deps committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Mon, 15 Sep 2003 22:18:32 +0000
parents 63261dc7aa25
children 4146b836ba0a
files gaim-installer.nsi
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gaim-installer.nsi	Mon Sep 15 22:12:32 2003 +0000
+++ b/gaim-installer.nsi	Mon Sep 15 22:18:32 2003 +0000
@@ -40,6 +40,7 @@
 !define MUI_HEADERBITMAP		.\src\win32\nsis\gaim-header.bmp
 
 !define GAIM_NSIS_INCLUDE_PATH		".\src\win32\nsis"
+!define GAIM_INSTALLER_DEPS		"..\win32-dev\gaim-inst-deps"
 
 !define GAIM_REG_KEY			"SOFTWARE\gaim"
 !define GAIM_UNINSTALL_KEY		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gaim"
@@ -345,14 +346,14 @@
     SetOverwrite on
     File /r .\win32-install-dir\*.*
     !ifdef DEBUG
-    File ..\win32-dev\drmingw\exchndl.dll
+    File "${GAIM_INSTALLER_DEPS}\exchndl.dll"
     !endif
 
     ; Install shfolder.dll if need be..
     SearchPath $R4 "shfolder.dll"
     StrCmp $R4 "" 0 got_shfolder
       SetOutPath "$SYSDIR"
-      File ..\win32-dev\ms-deps\shfolder.dll
+      File "${GAIM_INSTALLER_DEPS}\shfolder.dll"
       SetOutPath "$INSTDIR"
     got_shfolder: