From ba5b4f385dbfb460ac854fb8bdbadf236b0ebc60 Mon Sep 17 00:00:00 2001
From: Joost Verburg <joostverburg@users.sourceforge.net>
Date: Wed, 25 Jul 2007 18:59:21 +0000
Subject: [PATCH] fix dictionary downloading

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19213 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/Win32/packaging/installer/components/dicts.nsh | 2 +-
 .../Win32/packaging/installer/components/external.nsh      | 2 +-
 development/Win32/packaging/installer/include/download.nsh | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/development/Win32/packaging/installer/components/dicts.nsh b/development/Win32/packaging/installer/components/dicts.nsh
index db7f93d9d8..95dfb9d66e 100644
--- a/development/Win32/packaging/installer/components/dicts.nsh
+++ b/development/Win32/packaging/installer/components/dicts.nsh
@@ -106,7 +106,7 @@ Function DownloadDictionary
 
   dict_download:
 
-    !insertmacro DownloadFile $R3 ASPELLDICTS aspell6-$R0.exe
+    !insertmacro DownloadFile $R3 ASPELLDICTS aspell6-$R0.exe /aspell6-$R0.exe
 
     ${if} $R3 != "OK"
       #Download failed
diff --git a/development/Win32/packaging/installer/components/external.nsh b/development/Win32/packaging/installer/components/external.nsh
index 2c33850faa..0ac4109ddf 100644
--- a/development/Win32/packaging/installer/components/external.nsh
+++ b/development/Win32/packaging/installer/components/external.nsh
@@ -73,7 +73,7 @@ External Components: MiKTeX, ImageMagick, Ghostscript
 
     download_${COMPONENT}:
 
-      !insertmacro DownloadFile $R0 "${COMPONENT}" "${COMPONENT}Setup.exe"
+      !insertmacro DownloadFile $R0 "${COMPONENT}" "${COMPONENT}Setup.exe" ""
  
       ${if} $R0 != "OK"
         #Download failed
diff --git a/development/Win32/packaging/installer/include/download.nsh b/development/Win32/packaging/installer/include/download.nsh
index ddd78ae68a..bf52b96543 100644
--- a/development/Win32/packaging/installer/include/download.nsh
+++ b/development/Win32/packaging/installer/include/download.nsh
@@ -4,21 +4,22 @@ Support code for file downloads
 
 */
 
-!macro DownloadFile RET ID FILENAME
+!macro DownloadFile RET ID FILENAME APPEND
 
   #Downloads a file using the InetLoad plug-in (HTTP or FTP)
   
   #RET = Return value (OK if succesful)
   #ID = Name of the download in settings.nsh
   #FILENAME = Location to store file
+  #APPEND = Filename to append to server location in settings.nsh
 
   #Try first mirror server
-  InetLoad::load "${DOWNLOAD_${ID}}" "$PLUGINSDIR\${FILENAME}" /END
+  InetLoad::load "${DOWNLOAD_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}" /END
   Pop ${RET} #Return value (OK if succesful)
 
   ${if} ${RET} != "OK"
     #Download failed, try second mirror server
-    InetLoad::load "${DOWNLOADALT_${ID}}" "$PLUGINSDIR\${FILENAME}" /END
+    InetLoad::load "${DOWNLOADALT_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}" /END
     Pop ${RET}
   ${endif}