Midori Web Browser

Merge lp:~tuxator/midori/nsis-lnk into lp:midori

  1. nsis-lnk
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6538
Merged at revision: 6539
Proposed branch: lp:~tuxator/midori/nsis-lnk
Merge into: lp:midori
Diff against target: 25 lines (+3/-1)
2 files modified
win32/makedist/makedist.midori (+1/-1)
win32/makedist/midori.nsi (+2/-0)
To merge this branch: bzr merge lp:~tuxator/midori/nsis-lnk
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+201699@code.launchpad.net

Commit message

nsis: Explicitly reset OUTDIR when creating desktop shortcuts

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Makes sense.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'win32/makedist/makedist.midori'
2--- win32/makedist/makedist.midori 2013-11-19 19:55:28 +0000
3+++ win32/makedist/makedist.midori 2014-01-15 00:44:05 +0000
4@@ -354,7 +354,7 @@
5 if [ "$NSIS" != "" ];then
6 nsis_file=Midori-${version}_setup.exe
7 echo "Creating $nsis_file"
8- makensis -NOCD -V2 ./midori.nsi
9+ makensis -NOCD -V4 ./midori.nsi
10 mv $nsis_file $where_am_i
11 fi
12 popd > /dev/null
13
14=== modified file 'win32/makedist/midori.nsi'
15--- win32/makedist/midori.nsi 2013-11-19 23:41:59 +0000
16+++ win32/makedist/midori.nsi 2014-01-15 00:44:05 +0000
17@@ -275,6 +275,8 @@
18
19 Section "Desktop Shortcuts" SEC03
20 SectionIn 1
21+ # CreateShortCut implicitly sets content of OUTDIR as working directory for shortcut, set it to bin
22+ SetOutPath "$INSTDIR\bin"
23 CreateShortCut "$DESKTOP\Midori.lnk" "${PRODUCT_EXE}"
24 CreateShortCut "$QUICKLAUNCH\Midori.lnk" "${PRODUCT_EXE}"
25 SectionEnd

Subscribers

People subscribed via source and target branches

to all changes: