correct intepolation for defines in NSIS

This commit is contained in:
Stephen Birarda 2016-01-11 10:17:54 -08:00
parent 9c8a05fad9
commit 70077591df

View file

@ -3,8 +3,8 @@
;--------------------------------
; Variables that drive High Fidelity custom behaviour
StrCpy $INTERFACE_SHORTCUT_NAME "High Fidelity"
StrCpy $INTERFACE_EXEC_NAME "interface.exe"
!define INTERFACE_SHORTCUT_NAME "High Fidelity"
!define INTERFACE_EXEC_NAME "interface.exe"
;--------------------------------
; You must define these values
@ -704,7 +704,7 @@ Section "-Core installation"
; Conditional handling for interface shortcut
${If} ${SectionIsSelected} ${client}
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\$INTERFACE_SHORTCUT_NAME.lnk" "$INSTDIR\$INTERFACE_EXEC_NAME"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\${INTERFACE_SHORTCUT_NAME}.lnk" "$INSTDIR\${INTERFACE_EXEC_NAME}"
${EndIf}
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
@ -861,7 +861,7 @@ Section "Uninstall"
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
Delete "$SMPROGRAMS\$MUI_TEMP\$INTERFACE_SHORTCUT_NAME.lnk"
Delete "$SMPROGRAMS\$MUI_TEMP\${INTERFACE_SHORTCUT_NAME}.lnk"
@CPACK_NSIS_DELETE_ICONS@
@CPACK_NSIS_DELETE_ICONS_EXTRA@