|
|
@@ -642,7 +642,7 @@ Section "-Core installation"
|
|
|
WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
|
|
|
|
|
|
;Create uninstaller
|
|
|
- WriteUninstaller "$INSTDIR\Uninstall.exe"
|
|
|
+ WriteUninstaller "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe"
|
|
|
Push "DisplayName"
|
|
|
Push "@CPACK_NSIS_DISPLAY_NAME@"
|
|
|
Call ConditionalAddToRegisty
|
|
|
@@ -653,7 +653,7 @@ Section "-Core installation"
|
|
|
Push "@CPACK_PACKAGE_VENDOR@"
|
|
|
Call ConditionalAddToRegisty
|
|
|
Push "UninstallString"
|
|
|
- Push "$INSTDIR\Uninstall.exe"
|
|
|
+ Push "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe"
|
|
|
Call ConditionalAddToRegisty
|
|
|
Push "NoRepair"
|
|
|
Push "1"
|
|
|
@@ -690,7 +690,7 @@ Section "-Core installation"
|
|
|
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
|
|
|
@CPACK_NSIS_CREATE_ICONS@
|
|
|
@CPACK_NSIS_CREATE_ICONS_EXTRA@
|
|
|
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
|
|
|
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe"
|
|
|
|
|
|
;Read a value from an InstallOptions INI file
|
|
|
!insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State"
|
|
|
@@ -829,7 +829,7 @@ Section "Uninstall"
|
|
|
!endif
|
|
|
|
|
|
;Remove the uninstaller itself.
|
|
|
- Delete "$INSTDIR\Uninstall.exe"
|
|
|
+ Delete "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe"
|
|
|
DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
|
|
|
|
|
|
;Remove the installation directory if it is empty.
|