Index: SCons/Config/gnu
--- SCons/Config/gnu.orig	2009-02-05 01:52:28 +0100
+++ SCons/Config/gnu	2009-06-27 14:02:32 +0200
@@ -1,5 +1,7 @@
 print "Using GNU tools configuration"
 
+import os
+
 Import('defenv')
 
 ### imports
@@ -89,14 +91,13 @@
 makensis_env.Append(CPPPATH = ['#$BUILD_CONFIG'])
 
 if not defenv['DEBUG']:
-	makensis_env.Append(CCFLAGS = ['-O2'])                  # optimize
+	makensis_env.Append(CCFLAGS = os.getenv('OPENPKG_CCFLAGS'))
+	makensis_env.Append(LINKFLAGS = os.getenv('OPENPKG_LINKFLAGS'))
 makensis_env.Append(CFLAGS = ['-Wall'])                   # all warnings
 makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings
 makensis_env.Append(CXXFLAGS = ['-Wall'])                 # all warnings
 
 conf = FlagsConfigure(makensis_env)
-conf.CheckCompileFlag('-m32')                     #
-conf.CheckLinkFlag('-m32')                        #
 conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file
 if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
 	TestStrip(conf)                                 # strip
@@ -148,9 +149,9 @@
 
 ### cross-platform util environment adjustments
 
+cp_util_env.Append(CCFLAGS = os.getenv('OPENPKG_CCFLAGS'))
+cp_util_env.Append(LINKFLAGS = os.getenv('OPENPKG_LINKFLAGS'))
 conf = FlagsConfigure(cp_util_env)
-conf.CheckCompileFlag('-m32')
-conf.CheckLinkFlag('-m32')
 if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
 	TestStrip(conf)                                 # strip
 conf.Finish()
@@ -160,8 +161,6 @@
 test_env = defenv.Clone()
 test_env.Append(CPPPATH = ['#$BUILD_CONFIG'])
 conf = FlagsConfigure(test_env)
-conf.CheckCompileFlag('-m32')
-conf.CheckLinkFlag('-m32')
 conf.Finish()
 
 ### weird GCC requirements
Index: nsis-2.46/Contrib/Modern UI 2/Deprecated.nsh
--- nsis-2.46/Contrib/Modern UI 2/Deprecated.nsh.orig	2007-12-22 12:13:28 +0100
+++ nsis-2.46/Contrib/Modern UI 2/Deprecated.nsh	2009-06-26 20:20:56 +0200
@@ -67,6 +67,6 @@
 !macro MUI_RESERVEFILE_INSTALLOPTIONS
 
   !define MUI_DOLLAR "$"
-  !error "MUI_RESERVEFILE_INSTALLOPTIONS is no longer supported as InstallOptions is no longer used by MUI2. Instead, use ReserveFile '${MUI_DOLLAR}{NSISDIR}\Plugins\InstallOptions.dll'. It is also recommended to upgrade to nsDialogs."
+  !error "MUI_RESERVEFILE_INSTALLOPTIONS is no longer supported as InstallOptions is no longer used by MUI2. Instead, use ReserveFile '${MUI_DOLLAR}{NSISDIR}/Plugins/InstallOptions.dll'. It is also recommended to upgrade to nsDialogs."
 
 !macroend
Index: nsis-2.46/Contrib/Modern UI 2/Interface.nsh
--- nsis-2.46/Contrib/Modern UI 2/Interface.nsh.orig	2008-04-18 20:20:50 +0200
+++ nsis-2.46/Contrib/Modern UI 2/Interface.nsh	2009-06-26 20:21:29 +0200
@@ -43,17 +43,17 @@
     !endif
 
     ;Default interface settings
-    !insertmacro MUI_DEFAULT MUI_UI "${NSISDIR}\Contrib\UIs\modern.exe"
-    !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE "${NSISDIR}\Contrib\UIs\modern_headerbmp.exe"
-    !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE_RIGHT "${NSISDIR}\Contrib\UIs\modern_headerbmpr.exe"
-    !insertmacro MUI_DEFAULT MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
-    !insertmacro MUI_DEFAULT MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+    !insertmacro MUI_DEFAULT MUI_UI "${NSISDIR}/Contrib/UIs/modern.exe"
+    !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE "${NSISDIR}/Contrib/UIs/modern_headerbmp.exe"
+    !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE_RIGHT "${NSISDIR}/Contrib/UIs/modern_headerbmpr.exe"
+    !insertmacro MUI_DEFAULT MUI_ICON "${NSISDIR}/Contrib/Graphics/Icons/modern-install.ico"
+    !insertmacro MUI_DEFAULT MUI_UNICON "${NSISDIR}/Contrib/Graphics/Icons/modern-uninstall.ico"
     !insertmacro MUI_DEFAULT MUI_BGCOLOR "FFFFFF"
 
     ;Default header images
     !ifdef MUI_HEADERIMAGE
 
-      !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp"
+      !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_BITMAP "${NSISDIR}/Contrib/Graphics/Header/nsis.bmp"
 
       !ifndef MUI_HEADERIMAGE_UNBITMAP
         !define MUI_HEADERIMAGE_UNBITMAP "${MUI_HEADERIMAGE_BITMAP}"
@@ -145,24 +145,24 @@
 
       ${if} $(^RTL) == 1
 
-        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL}"
+        File "/oname=$PLUGINSDIR/modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL}"
 
         !ifndef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL_NOSTRETCH
-          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
+          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR/modern-header.bmp"
         !else
-          SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+          SetBrandingImage /IMGID=1046 "$PLUGINSDIR/modern-header.bmp"
         !endif
 
       ${else}
 
     !endif
 
-        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP}"
+        File "/oname=$PLUGINSDIR/modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP}"
 
         !ifndef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_NOSTRETCH
-          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
+          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR/modern-header.bmp"
         !else
-          SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+          SetBrandingImage /IMGID=1046 "$PLUGINSDIR/modern-header.bmp"
         !endif
 
     !ifdef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL
Index: nsis-2.46/Contrib/Modern UI 2/Localization.nsh
--- nsis-2.46/Contrib/Modern UI 2/Localization.nsh.orig	2008-03-29 18:35:08 +0100
+++ nsis-2.46/Contrib/Modern UI 2/Localization.nsh	2009-06-26 20:21:51 +0200
@@ -35,10 +35,10 @@
 
   !insertmacro MUI_INSERT
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
+  LoadLanguageFile "${NSISDIR}/Contrib/Language-files/${LANGUAGE}.nlf"
 
   ;Include language file
-  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
+  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}/Contrib/Language-files/${LANGUAGE}.nsh" "${NSISDIR}/Contrib/Language-files/English.nsh"
 
   ;Add language to list of languages for selection dialog
   !ifndef MUI_LANGDLL_LANGUAGES
@@ -185,7 +185,7 @@
   !verbose push
   !verbose ${MUI_VERBOSE}
 
-  ReserveFile "${NSISDIR}\Plugins\LangDLL.dll"
+  ReserveFile "${NSISDIR}/Plugins/LangDLL.dll"
 
   !verbose pop
 
Index: nsis-2.46/Contrib/Modern UI 2/MUI2.nsh
--- nsis-2.46/Contrib/Modern UI 2/MUI2.nsh.orig	2009-02-01 16:44:30 +0100
+++ nsis-2.46/Contrib/Modern UI 2/MUI2.nsh	2009-06-26 20:20:47 +0200
@@ -22,7 +22,7 @@
 
 !verbose ${MUI_VERBOSE}
 
-!addincludedir "${NSISDIR}\Contrib\Modern UI 2"
+!addincludedir "${NSISDIR}/Contrib/Modern-UI-2"
 
 ;--------------------------------
 ;Header files required by MUI
@@ -79,14 +79,14 @@
 ;--------------------------------
 ;Pages
 
-!include "Pages\Components.nsh"
-!include "Pages\Directory.nsh"
-!include "Pages\Finish.nsh"
-!include "Pages\InstallFiles.nsh"
-!include "Pages\License.nsh"
-!include "Pages\StartMenu.nsh"
-!include "Pages\UninstallConfirm.nsh"
-!include "Pages\Welcome.nsh"
+!include "Pages/Components.nsh"
+!include "Pages/Directory.nsh"
+!include "Pages/Finish.nsh"
+!include "Pages/InstallFiles.nsh"
+!include "Pages/License.nsh"
+!include "Pages/StartMenu.nsh"
+!include "Pages/UninstallConfirm.nsh"
+!include "Pages/Welcome.nsh"
 
 
 ;--------------------------------
Index: nsis-2.46/Contrib/Modern UI 2/Pages/Components.nsh
--- nsis-2.46/Contrib/Modern UI 2/Pages/Components.nsh.orig	2008-02-21 00:34:12 +0100
+++ nsis-2.46/Contrib/Modern UI 2/Pages/Components.nsh	2009-06-26 20:22:20 +0200
@@ -27,10 +27,10 @@
     
     Var mui.ComponentsPage.SpaceRequired
     
-    !insertmacro MUI_DEFAULT MUI_COMPONENTSPAGE_CHECKBITMAP "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp"
+    !insertmacro MUI_DEFAULT MUI_COMPONENTSPAGE_CHECKBITMAP "${NSISDIR}/Contrib/Graphics/Checks/modern.bmp"
     
-    !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_SMALLDESC "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
-    !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_NODESC "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
+    !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_SMALLDESC "${NSISDIR}/Contrib/UIs/modern_smalldesc.exe"
+    !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_NODESC "${NSISDIR}/Contrib/UIs/modern_nodesc.exe"
     
     ;Apply settings
     
Index: nsis-2.46/Contrib/Modern UI 2/Pages/Finish.nsh
--- nsis-2.46/Contrib/Modern UI 2/Pages/Finish.nsh.orig	2009-06-06 17:26:08 +0200
+++ nsis-2.46/Contrib/Modern UI 2/Pages/Finish.nsh	2009-06-26 20:22:47 +0200
@@ -71,7 +71,7 @@
     !endif
   !endif
 
-  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"  
+  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}/Contrib/Graphics/Wizard/win.bmp"  
 
 !macroend
 
@@ -87,7 +87,7 @@
     Function ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.FinishPage.GUIInit
   
       InitPluginsDir  
-      File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP}"
+      File "/oname=$PLUGINSDIR/modern-wizard.bmp" "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP}"
     
       !ifdef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}PAGE_FUNCTION_GUIINIT
         Call "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}PAGE_FUNCTION_GUIINIT}"
@@ -265,9 +265,9 @@
     ${NSD_CreateBitmap} 0u 0u 109u 193u ""
     Pop $mui.FinishPage.Image
     !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-      ${NSD_SetStretchedImage} $mui.FinishPage.Image $PLUGINSDIR\modern-wizard.bmp $mui.FinishPage.Image.Bitmap
+      ${NSD_SetStretchedImage} $mui.FinishPage.Image $PLUGINSDIR/modern-wizard.bmp $mui.FinishPage.Image.Bitmap
     !else
-      ${NSD_SetImage} $mui.FinishPage.Image $PLUGINSDIR\modern-wizard.bmp $mui.FinishPage.Image.Bitmap
+      ${NSD_SetImage} $mui.FinishPage.Image $PLUGINSDIR/modern-wizard.bmp $mui.FinishPage.Image.Bitmap
     !endif
     
     ;Positiong of controls
Index: nsis-2.46/Contrib/Modern UI 2/Pages/Welcome.nsh
--- nsis-2.46/Contrib/Modern UI 2/Pages/Welcome.nsh.orig	2008-12-20 10:17:14 +0100
+++ nsis-2.46/Contrib/Modern UI 2/Pages/Welcome.nsh	2009-06-26 20:23:23 +0200
@@ -23,7 +23,7 @@
     Var mui.WelcomePage.Text    
   !endif
   
-  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"  
+  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}/Contrib/Graphics/Wizard/win.bmp"  
 
 !macroend
 
@@ -39,7 +39,7 @@
     Function ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}mui.WelcomePage.GUIInit
       
       InitPluginsDir
-      File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP}"
+      File "/oname=$PLUGINSDIR/modern-wizard.bmp" "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP}"
     
       !ifdef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}PAGE_FUNCTION_GUIINIT
         Call "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}PAGE_FUNCTION_GUIINIT}"
@@ -127,9 +127,9 @@
     ${NSD_CreateBitmap} 0u 0u 109u 193u ""
     Pop $mui.WelcomePage.Image
     !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-      ${NSD_SetStretchedImage} $mui.WelcomePage.Image $PLUGINSDIR\modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
+      ${NSD_SetStretchedImage} $mui.WelcomePage.Image $PLUGINSDIR/modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
     !else
-      ${NSD_SetImage} $mui.WelcomePage.Image $PLUGINSDIR\modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
+      ${NSD_SetImage} $mui.WelcomePage.Image $PLUGINSDIR/modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
     !endif
 
     ;Positiong of controls
Index: nsis-2.46/Contrib/Modern UI/System.nsh
--- nsis-2.46/Contrib/Modern UI/System.nsh.orig	2009-02-01 16:44:30 +0100
+++ nsis-2.46/Contrib/Modern UI/System.nsh	2009-06-26 20:20:15 +0200
@@ -117,26 +117,26 @@
       !insertmacro MUI_NSISCONF
     !endif
 
-    !insertmacro MUI_DEFAULT MUI_UI "${NSISDIR}\Contrib\UIs\modern.exe"
-    !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE "${NSISDIR}\Contrib\UIs\modern_headerbmp.exe"
-    !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE_RIGHT "${NSISDIR}\Contrib\UIs\modern_headerbmpr.exe"
-    !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_SMALLDESC "${NSISDIR}\Contrib\UIs\modern_smalldesc.exe"
-    !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_NODESC "${NSISDIR}\Contrib\UIs\modern_nodesc.exe"
-    !insertmacro MUI_DEFAULT MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
-    !insertmacro MUI_DEFAULT MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
-    !insertmacro MUI_DEFAULT MUI_COMPONENTSPAGE_CHECKBITMAP "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp"
+    !insertmacro MUI_DEFAULT MUI_UI "${NSISDIR}/Contrib/UIs/modern.exe"
+    !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE "${NSISDIR}/Contrib/UIs/modern_headerbmp.exe"
+    !insertmacro MUI_DEFAULT MUI_UI_HEADERIMAGE_RIGHT "${NSISDIR}/Contrib/UIs/modern_headerbmpr.exe"
+    !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_SMALLDESC "${NSISDIR}/Contrib/UIs/modern_smalldesc.exe"
+    !insertmacro MUI_DEFAULT MUI_UI_COMPONENTSPAGE_NODESC "${NSISDIR}/Contrib/UIs/modern_nodesc.exe"
+    !insertmacro MUI_DEFAULT MUI_ICON "${NSISDIR}/Contrib/Graphics/Icons/modern-install.ico"
+    !insertmacro MUI_DEFAULT MUI_UNICON "${NSISDIR}/Contrib/Graphics/Icons/modern-uninstall.ico"
+    !insertmacro MUI_DEFAULT MUI_COMPONENTSPAGE_CHECKBITMAP "${NSISDIR}/Contrib/Graphics/Checks/modern.bmp"
     !insertmacro MUI_DEFAULT MUI_LICENSEPAGE_BGCOLOR "/windows"
     !insertmacro MUI_DEFAULT MUI_INSTFILESPAGE_COLORS "/windows"
     !insertmacro MUI_DEFAULT MUI_INSTFILESPAGE_PROGRESSBAR "smooth"
     !insertmacro MUI_DEFAULT MUI_BGCOLOR "FFFFFF"
-    !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
-    !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
-    !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
-    !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
+    !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}/Contrib/Modern-UI/ioSpecial.ini"
+    !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}/Contrib/Modern-UI/ioSpecial.ini"
+    !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}/Contrib/Graphics/Wizard/win.bmp"
+    !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}/Contrib/Graphics/Wizard/win.bmp"
 
     !ifdef MUI_HEADERIMAGE
 
-      !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp"
+      !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_BITMAP "${NSISDIR}/Contrib/Graphics/Header/nsis.bmp"
 
       !ifndef MUI_HEADERIMAGE_UNBITMAP
         !define MUI_HEADERIMAGE_UNBITMAP "${MUI_HEADERIMAGE_BITMAP}"
@@ -435,9 +435,9 @@
   !ifdef MUI_${UNINSTALLER}WELCOMEPAGE | MUI_${UNINSTALLER}FINISHPAGE
 
     !insertmacro INSTALLOPTIONS_EXTRACT_AS "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
-    File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_BITMAP}"
+    File "/oname=$PLUGINSDIR/modern-wizard.bmp" "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_BITMAP}"
 
-    !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
+    !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR/modern-wizard.bmp"
 
     !ifdef MUI_${UNINSTALLER}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
       !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Flags" ""
@@ -457,12 +457,12 @@
 
     StrCmp $(^RTL) 0 mui.headerimageinit_nortl
 
-        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL}"
+        File "/oname=$PLUGINSDIR/modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL}"
 
         !ifndef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL_NOSTRETCH
-          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
+          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR/modern-header.bmp"
         !else
-          SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+          SetBrandingImage /IMGID=1046 "$PLUGINSDIR/modern-header.bmp"
         !endif
 
         Goto mui.headerimageinit_done
@@ -471,12 +471,12 @@
 
     !endif
 
-        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP}"
+        File "/oname=$PLUGINSDIR/modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP}"
 
         !ifndef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_NOSTRETCH
-          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
+          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR/modern-header.bmp"
         !else
-          SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+          SetBrandingImage /IMGID=1046 "$PLUGINSDIR/modern-header.bmp"
         !endif
 
     !ifdef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL
@@ -2048,7 +2048,7 @@
   !verbose push
   !verbose ${MUI_VERBOSE}
 
-  ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
+  ReserveFile "${NSISDIR}/Plugins/InstallOptions.dll"
 
   !verbose pop
 
@@ -2059,7 +2059,7 @@
   !verbose push
   !verbose ${MUI_VERBOSE}
 
-  ReserveFile "${NSISDIR}\Plugins\LangDLL.dll"
+  ReserveFile "${NSISDIR}/Plugins/LangDLL.dll"
 
   !verbose pop
 
@@ -2077,10 +2077,10 @@
 
   !insertmacro MUI_INSERT
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
+  LoadLanguageFile "${NSISDIR}/Contrib/Language-files/${LANGUAGE}.nlf"
 
   ;Include language file
-  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
+  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}/Contrib/Language-files/${LANGUAGE}.nsh" "${NSISDIR}/Contrib/Language-files/English.nsh"
 
   ;Add language to list of languages for selection dialog  
   !ifndef MUI_LANGDLL_LANGUAGES
Index: nsis-2.46/Include/MUI.nsh
--- nsis-2.46/Include/MUI.nsh.orig	2007-12-01 13:43:02 +0100
+++ nsis-2.46/Include/MUI.nsh	2009-06-26 20:15:19 +0200
@@ -1 +1 @@
-!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
\ No newline at end of file
+!include "${NSISDIR}/Contrib/Modern-UI/System.nsh"
Index: nsis-2.46/Include/MUI2.nsh
--- nsis-2.46/Include/MUI2.nsh.orig	2007-12-01 13:43:02 +0100
+++ nsis-2.46/Include/MUI2.nsh	2009-06-26 20:15:19 +0200
@@ -1 +1 @@
-!include "${NSISDIR}\Contrib\Modern UI 2\MUI2.nsh"
\ No newline at end of file
+!include "${NSISDIR}/Contrib/Modern-UI-2/MUI2.nsh"