From 2f76ada0c0a408b5703ca35faff615f350fee338 Mon Sep 17 00:00:00 2001
From: Sergey Popov <loonycyborg@gmail.com>
Date: Fri, 5 Dec 2008 18:39:58 +0000
Subject: [PATCH] Made shortcuts created by NSIS installer pass --config-dir.

---
 packaging/windows/Wesnoth.nsi.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packaging/windows/Wesnoth.nsi.in b/packaging/windows/Wesnoth.nsi.in
index a0e43db69e0..0c523c9df97 100644
--- a/packaging/windows/Wesnoth.nsi.in
+++ b/packaging/windows/Wesnoth.nsi.in
@@ -22,6 +22,8 @@
 ;Variables
 
   Var StartMenuFolder
+  !define UserdataDir Wesnoth1.5
+  !define UserdataFlags "--config-dir ${UserdataDir}"  
 
 ;--------------------------------
 ;Interface Settings
@@ -56,6 +58,7 @@
   !insertmacro MUI_PAGE_INSTFILES
 
   !define MUI_FINISHPAGE_RUN $INSTDIR\wesnoth.exe
+  !define MUI_FINISHPAGE_RUN_PARAMETERS "${UserdataFlags}"
   !insertmacro MUI_PAGE_FINISH
   
   !insertmacro MUI_UNPAGE_CONFIRM
@@ -164,8 +167,8 @@ Section "Battle for Wesnoth" BfWSection
     
     ;Create shortcuts
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Battle for Wesnoth.lnk" "$INSTDIR\wesnoth.exe"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Map editor.lnk" "$INSTDIR\wesnoth.exe" "-e" "$INSTDIR\wesnoth_editor-icon.ico"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Battle for Wesnoth.lnk" "$INSTDIR\wesnoth.exe" "${UserdataFlags}"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Map editor.lnk" "$INSTDIR\wesnoth.exe" "-e ${UserdataFlags}" "$INSTDIR\wesnoth_editor-icon.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Multiplayer server.lnk" "$INSTDIR\wesnothd.exe"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Manual.lnk" "$INSTDIR\manual\manual.en.html"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"