Packaging: Fix some paths.

packaging/nsis/uninstall.nsi

@@ -18,11 +18,11 @@ InstType "un.Default (keep Personal Settings and Npcap)"
 InstType "un.All (remove all)"
 
 ; Uninstaller icon
-UninstallIcon "..\..\resources\wiresharkinst.ico"
+UninstallIcon "..\..\resources\icons\wiresharkinst.ico"
 
 !include "MUI.nsh"
 
-!define MUI_UNICON "..\..\resources\wiresharkinst.ico"
+!define MUI_UNICON "..\..\resources\icons\wiresharkinst.ico"
 
 ; Uninstall stuff (NSIS 2.08: "\r\n" don't work here)
 !define MUI_UNCONFIRMPAGE_TEXT_TOP "The following ${PROGRAM_NAME} installation will be removed. Click 'Next' to continue."

packaging/nsis/wireshark.nsi

@@ -40,7 +40,7 @@ ${StrRep}
 ; The file to write
 OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"
 ; Installer icon
-Icon "${TOP_SRC_DIR}\resources\wiresharkinst.ico"
+Icon "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
 
 ; ============================================================================
 ; Modern UI
@@ -55,7 +55,7 @@ Icon "${TOP_SRC_DIR}\resources\wiresharkinst.ico"
 !include "InstallOptions.nsh"
 ;!addplugindir ".\Plugins"
 
-!define MUI_ICON "${TOP_SRC_DIR}\resources\wiresharkinst.ico"
+!define MUI_ICON "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
 BrandingText "Wireshark${U+00ae} Installer"
 
 !define MUI_COMPONENTSPAGE_SMALLDESC

packaging/wix/CMakeLists.txt

@@ -217,7 +217,7 @@ set(WIX_CANDLE_DEFINES
 	-dAssetDir=${CMAKE_SOURCE_DIR}/packaging/wix
 	-dBuildOutputDir=${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}
 	-dDiameterDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/diameter
-	-dIconDir=${CMAKE_SOURCE_DIR}/image
+	-dIconDir=${CMAKE_SOURCE_DIR}/resources/icons
 	-dQtTranslationDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/translations
 	-dRadiusDictDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/radius
 	-dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/snmp/mibs