[rkward-cvs] SF.net SVN: rkward:[3981] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 3981
          http://rkward.svn.sourceforge.net/rkward/?rev=3981&view=rev
Author:   tfry
Date:     2011-10-20 16:50:52 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Merge windows installer fixes from release branch

Modified Paths:
--------------
    trunk/rkward/windows_nsis/installer.nsi

Property Changed:
----------------
    trunk/rkward/
    trunk/rkward/debian/


Property changes on: trunk/rkward
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
/branches/release_branch_0.5.7:3913
   + /branches/2010_10_18_backend_restructuring_branch:3130-3196
/branches/release_branch_0.5.4:3098-3102,3127
/branches/release_branch_0.5.7:3913,3979-3980


Property changes on: trunk/rkward/debian
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2010_10_18_backend_restructuring_branch/debian:3130-3196
/branches/release_branch_0.5.4:3098-3102
/branches/release_branch_0.5.4/debian:3098-3102
/branches/release_branch_0.5.7/debian:3913
   + /branches/2010_10_18_backend_restructuring_branch/debian:3130-3196
/branches/release_branch_0.5.4:3098-3102
/branches/release_branch_0.5.4/debian:3098-3102
/branches/release_branch_0.5.7/debian:3913,3979-3980

Modified: trunk/rkward/windows_nsis/installer.nsi
===================================================================
--- trunk/rkward/windows_nsis/installer.nsi	2011-10-20 16:44:25 UTC (rev 3980)
+++ trunk/rkward/windows_nsis/installer.nsi	2011-10-20 16:50:52 UTC (rev 3981)
@@ -212,7 +212,7 @@
 	StrCpy $KDEPrefixOk "no"
 	StrCpy $1 ""
 	StrCpy $2 ""
-	StrCpy $Libktexteditor_dll_location $FileSelectCurrent\lib\libktexteditor.dll.a
+	StrCpy $Libktexteditor_dll_location $FileSelectCurrent\bin\libktexteditor.dll
 
 	IfFileExists $FileSelectCurrent\bin bindir_found
 		StrCpy $0 "Directory $FileSelectCurrent\bin does not exist"
@@ -302,6 +302,7 @@
 
 	setOutPath $INST_KDEPREFIX\bin
 	File "rkward.ico"
+	setOutPath %USERPROFILE%
 	CreateShortCut "$DESKTOP\RKWard.lnk" "$INST_KDEPREFIX\bin\rkward.bat" "" "$INST_KDEPREFIX\bin\rkward.ico"
 
 #	writeUninstaller $INST_KDEPREFIX\uninstaller.exe

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.