diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 686cf27913..e0367e9315 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -12,7 +12,7 @@ These typically need to be modified for each LyX release !define APP_VERSION_MAJOR 2 !define APP_VERSION_MINOR 0 !define APP_VERSION_REVISION 2 -!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version +!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display @@ -50,7 +50,7 @@ These typically need to be modified for each LyX release !define JabRefVersion "2.7" !define MiKTeXDeliveredVersion "2.9" -!define ImageMagickVersion "6.7.3" +!define ImageMagickVersion "6.7.4" # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 8513dc4798..e1e3658f73 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -242,7 +242,7 @@ Function StartLyX # the time consuming LaTeX package installation #Exec 'cmd /K " "$INSTDIR\bin\lyx.exe""' - Exec "$INSTDIR\${AppRun}" + Exec "$INSTDIR\${APP_RUN}" FunctionEnd diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index 7553c3151c..763e65ae9f 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -71,7 +71,7 @@ Section "un.LyX" un.SecUnProgramFiles # Application folder SetOutPath "$TEMP" - RMDir "$INSTDIR" + RMDir /r "$INSTDIR" # Registry keys DeleteRegKey SHCTX "${APP_REGKEY_SETUP}"