diff options
| author | Jabiertxof <jtx@jtx> | 2017-04-26 23:07:04 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2017-04-26 23:07:04 +0000 |
| commit | 5a052707b38813c1a617f57dca9e65fee4b94fea (patch) | |
| tree | d31b6fd3e53a361a7441add8662c4e35c66026be | |
| parent | Add LPE prefs dialog (diff) | |
| parent | Packaging: Fix wrong working directory in shortcuts created by NSIS installer (diff) | |
| download | inkscape-5a052707b38813c1a617f57dca9e65fee4b94fea.tar.gz inkscape-5a052707b38813c1a617f57dca9e65fee4b94fea.zip | |
Update to trunk
(bzr r15620.1.5)
| -rw-r--r-- | packaging/win32/inkscape.nsi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 7bc65cc69..525df2294 100644 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -136,11 +136,13 @@ ReserveFile /plugin UserInfo.dll ; Find inkscape distribution directory (uncomment line below to manually define) ;!define INKSCAPE_DIST_DIR ..\..\inkscape !ifdef INKSCAPE_DIST_DIR - ${!ifnexist} ${INKSCAPE_DIST_DIR}\inkscape.exe + ${!defineifexist} ${INKSCAPE_DIST_DIR}\inkscape.exe FOUND 1 + !ifndef FOUND !error "inkscape.exe not found in INKSCAPE_DIST_DIR ('${INKSCAPE_DIST_DIR}')" + !endif !endif !ifndef INKSCAPE_DIST_DIR - ${!defineifexist} ${INKSCAPE_DIST_DIR}\inkscape.exe INKSCAPE_DIST_DIR ..\..\inkscape ; btool default + ${!defineifexist} ..\..\inkscape\inkscape.exe INKSCAPE_DIST_DIR ..\..\inkscape ; btool default !endif !ifndef INKSCAPE_DIST_DIR ${!defineifexist} ..\..\build\inkscape\inkscape.exe INKSCAPE_DIST_DIR ..\..\build\inkscape ; cmake default @@ -424,6 +426,7 @@ SectionGroup "$(Shortcuts)" SecShortcuts ; Create shortcuts for the user {{{ Section "$(Startmenu)" SecStartMenu ; Start menu shortcut {{{ SectionIn 1 2 3 !ifndef DUMMYINSTALL + SetOutPath $INSTDIR CreateShortcut $SMPROGRAMS\Inkscape.lnk $INSTDIR\inkscape.exe !endif SectionEnd ; SecStartMenu }}} @@ -431,6 +434,7 @@ SectionEnd ; SecStartMenu }}} Section "$(Desktop)" SecDesktop ; Desktop shortcut {{{ SectionIn 1 2 3 !ifndef DUMMYINSTALL + SetOutPath $INSTDIR CreateShortCut $DESKTOP\Inkscape.lnk $INSTDIR\inkscape.exe !endif SectionEnd ; SecDesktop }}} @@ -438,6 +442,7 @@ SectionEnd ; SecDesktop }}} Section "$(Quicklaunch)" SecQuickLaunch ; Quick Launch shortcut {{{ SectionIn 1 2 3 !ifndef DUMMYINSTALL + SetOutPath $INSTDIR ${IfThen} $QUICKLAUNCH != $TEMP ${|} CreateShortCut $QUICKLAUNCH\Inkscape.lnk $INSTDIR\inkscape.exe ${|} !endif SectionEnd ; SecQuickLaunch }}} |