diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 5 | ||||
| -rwxr-xr-x | packaging/ws-manifest.pl | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 5869ecf4d4..7a6dc70b25 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -19,8 +19,11 @@ SetCompressor /SOLID lzma ; ============================================================================ ; The file to write +!if ${GTK_NAME} == "gtk3" +OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe" +!else OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-gtk3-${VERSION}.exe" - +!endif ; Installer icon Icon "..\..\image\wiresharkinst.ico" diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl index fd9a0e20ea..ed228fd394 100755 --- a/packaging/ws-manifest.pl +++ b/packaging/ws-manifest.pl @@ -12,6 +12,8 @@ my %u3locs = qw( $INSTDIR\diameter device $INSTDIR\dtds device $INSTDIR\etc\gtk-2.0 host + $INSTDIR\etc\gtk-3.0 host + $INSTDIR\share\glib-2.0\schemas $INSTDIR\etc\pango host $INSTDIR\help device $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\engines host |